User Guide - MKS

Chapter 12: Advanced Change Package Operations
Resync CP
Procedures
386
Using Ignore Branches to apply two fixes in the same change package.
In this case, because the single change package applies to both the project
and the variant, the highest revision is the only one the buildmaster needs.
The Ignore Branches option therefore allows Source Integrity to apply the
highest revision to the buildmaster’s variant project.
Combining Options
Following the same example, you can also apply both the Merge On Branch
and Ignore Branches options. Selecting both options allows
Source Integrity to perform a differencing between revisions 1.3 and the
highest revision found, revision 1.3.1.2, and merge the result into revision
1.4.
This section describes the step-by-step procedures required to perform the
Resync CP command in both the graphical user interface and command
line interface.
NOTE
CP 10:1
patch.c 1.5 Master Project
patch.c 1.3.1.2 Variant Project
Applying CP 10:1 and selecting the Ignore Branches
option allows Source Integrity to choose the highest
available revision, 1.5.
At this time, the Resync CP command does not handle change package entries
for rename.
To resynchronize a change package in the graphical user interface
1 From a Sandbox window, select the project you want the Resync CP
command to operate on.
2 Select Change Package > Resynchronize Change Package.
u s e r g u i d e
patch.c
patch.c
Master Project
1.5 CP 10:1
Variant Project
1.3.1.2 CP 10:1