User Guide - Mks.com

Chapter 12: Advanced Change Package Operations
416
utility.c
Master Project
1.4
utility.c
Sandbox to Master
1.4
Archive for utility.c
1.4
1.3
1.2.1.2
1.2.1.1
1.2
1.1
CP 5:1
Using Resync CP with the Merge On Branch option
Using the Ignore Branches Option
utility.c
Another situation that warrants special consideration is the case where two
change packages must be applied. Unless the correct options are selected,
Resync CP will fail because too many merges are required.
For example, the master project contains the file patch.c at revision 1.4.
The variant project used by the buildmaster contains a fix (patch.c,
revision 1.2.1.2, CP 9:1) that is being rolled out for a product patch. The
variant project for the Maintenance Development team also includes a bug
fix for patch.c at revision 1.3.1.2, and this revision is associated with CP
10:1. Both fixes are required for the master project. To pick up all the
required changes, both CP 9:1 and CP 10:1 must be selected.
u s e r g u i d e
Variant Project
1.2.1.2
1.2 1.2.1.1
Differences between 1.2 and
1.2.1.2 merged into 1.4.
Result placed in sandbox.
To finalize changes in the
project, file must be checked in.