User Guide - MKS

Using the Resync CP Command
Using the Resync CP Command
While Apply CP works to either add, drop, or update member revisions,
you must accept the entire list of backfill entries or the command fails. In
the Resync CP operation, you are able to select the individual change
packages you want to exclude from the backfill operation and then
Source Integrity performs the required merges. Therefore, if you need to
merge files to create your solution, you must use the Resync CP command.
The Resync CP operation allows you to resynchronize revisions and carry
out merges entirely within a sandbox. When you are prompted to backfill
historical revisions (the Resync CP backfill list), you can select the change
packages you want to include. Resync CP automatically performs merging
and notifies you of unresolved conflicts that must be addressed manually
after the command completes.
How Does Resync CP Work?
To perform the operation, Source Integrity checks out all the files listed in
the selected change package(s) and places them in your sandbox. At the
same time, Source Integrity displays information on any conflicts, as well
as information on changes (or deltas).
Once the dependencies are calculated, and you have performed the
required merges, the operation completes and Source Integrity presents all
the files required for the new feature or content in your sandbox.
When Should I Use Resync CP?
You should use the Resync CP command when the Apply CP operation
has failed because there were conflicts to be resolved through merging.
Resync CP is most useful for developing software features and for
applying bug fixes during the software development process.
NOTE
When working in your sandbox, you can also use the Resynchronize By CP
command. When you select a member and use Resynchronize By CP,
Source Integrity automatically searches the change package associated with the
member and resynchronizes the selected member and all other member files
contained in that change package. For more information, see “Using the Resync
By CP Command” on page 405.
If the issues you are looking at have numerous associated change
packages, you can also use a single change package—a resolution change
package— that contains all the associated change packages, to resolve it.
The Resync CP command includes a process for creating resolution change
375