User Guide - MKS

Using the Apply CP Command
If Apply CP fails due to a required merge, use the Resync CP
command on the same change package and create a resolution change
package. Resync CP places the required files, locked, in your sandbox.
Verify the merges to ensure they are correct.
In your sandbox, check in the members, making sure to associate them
with the newly created resolution change package.
Close the resolution change package.
Apply that resolution change package to the project.
The Apply CP command works directly in the project, adding and
dropping files, and updating file revisions as required to apply the
resolution change package and update the project.
It is important to note that while Resync CP can be used to apply a
resolution change package, the results may not always be acceptable. For
example, if your bug fix is in an existing project member, there would
already be an archive for that member in the project. As a result, Resync CP
would add the modified member on a branch. This additional branching
might not be acceptable in your project.
NOTE
Using the Apply CP Command
A helpful practice prior to using Apply CP, is to start with a Resync CP
operation in a sandbox, and then build and test the results, even if no merges
are required. Because the operation may be creating a combination of source
code that has never existed before, this step ensures that the results will build
and work. Once you are certain of the results, you can then use the Apply CP
command and work directly in the project.
Apply CP relies on the use of change packages to track individual changes
that modify project content or create new content. The Apply CP operation
presents you with a backfill list that includes all of the change packages
required for the identified issue. If you accept the backfill list, the operation
then adds and drops files, and updates file revisions as required to create
the feature, content, or bug fix you are looking for.
355