User Guide - Mks.com

Archive for patch.c
Using the Resync CP Command
Performing a Resync CP operation on two change packages using the
Ignore Branches option
Running the Resync CP for two change packages requires more than a
three-way merge and therefore fails. Using the Ignore Branches option
(--ignoreBranches) Resync CP can successfully complete, but with a
restriction. The restriction is that Source Integrity searches both change
packages, takes the highest revision it finds, and uses this revision to
overwrite the working file in your sandbox.
In our example, the Resync CP operation would take patch.c at revision
1.3.1.2 and check it out to the sandbox, overwriting revision 1.4.
NOTE
1.4
1.3.1.2 CP 10:1
1.3.1.1
1.3
1.2
1.1
1.2.1.2 CP 9:1
1.2.1.1
patch.c
patch.c
patch.c
Project
Variant Project 1
1.3.1.2
Rapid Development
creates a bug fix
Buildmaster is
rolling out a fix
for a patch
There are only two ways to successfully complete the preceding scenario
without restrictions: address it manually, or perform Resync CP and Apply CP
twice (once for each change package), checking in the merged changes at the
head revision after each operation.
The Ignore Branches option can also be used to accommodate the case
where one developer has created the same fixes for both the project and the
variant, and associated with the same change package.
1.4
Variant Project 2
1.2.1.2
Product team needs
all the changes for
the master project
417