HSDK Class Descriptions › CaCrossProjectMerge › LPCTSTR GetMergeRule(void)

LPCTSTR GetMergeRule(void)

Gets Rule for how to merge the versions of files in the packages.

Note: The following are the allowable values for the Merge Rule. They are defined in an include file built into the project.

• MERGE_RULE_TRUNK_MERGE-Take the entire trunk version and ignore the version on the branch. This corresponds to the GUI TakeTrunk Version option.
• MERGE_RULE_BRANCH_MERGE-Take the entire branch version and ignore the version on the trunk. This corresponds to the GUI Take Branch Version option.
• MERGE_RULE_CONFLICT_TAG-Create a merge tag only if changes in branch and trunk conflict. This corresponds to the GUI Merge Aggressively option.
• MERGE_RULE_ALWAYS_TAG-Create a merge tag if there is any difference in the trunk and branch version at all. This corresponds to the GUI Merge Conservatively option.

Owning Class

CaCrossPackageMerge

Arguments

None

Return Value

LPCTSTR szRule-the rule value

Example

CaCrossProjectMerge& xprojmrg = rContext.GetCrossProjectMerge(); LPCTSTR szMergeRule = xprojmrg.GetMergeRule();

More information:

• HSDK Programming Fundamentals
• SetMergeRule