User Guide - MKS

NOTE
Working With a Resolution CP
Working With a Resolution CP
To see any change packages that have been applied between two revisions of a
project, use View Project Differences. For more information on viewing project
modifications, see “Viewing Project Differences” on page 244.
There are instances when the Apply CP command does not work on a set
of change packages because merging is required. When this happens, the
Resync CP command must be used to automate the required merging.
Once the Resync CP operation is completed, the modified files that result
from those merges are transferred to your sandbox. To apply the changes,
you must then check in those modified files.
For a development team using the change package methodology, the check
in of the modified files requires an associated issue and change package.
Once the issue has been created, the files can then be checked into the
associated change package and the development path updated with the
merged files.
If other developers want to apply the same set of change packages, how
can they be certain that the changes made relate only to the target feature
and that no other changes have been checked in? To be absolutely certain,
they would have to repeat the original Resync CP operation—a significant
duplication of effort. Otherwise, they would have to resynchronize using
the original set of change packages and possibly accept additional,
unwanted changes that were selected during the first Resync CP operation.
To avoid this uncertainty and duplication of effort, there is a mechanism
for recording all change packages that have been applied, including the
merge conflicts that have been resolved. The resolution change package is
the mechanism for recording these changes.
A resolution change package is a specialized change package that records
all applied change packages, resolved conflicts, checked in modified files,
and conflicts resolved by merging. A resolution change package is applied
when an Apply CP operation has failed due to unresolved conflicts that
require merging. Resolution change packages are created through the
Resync CP operation and cannot be manually created by the user.
In addition, you can only apply one resolution change package during
each Apply CP operation, and if you select a resolution change package,
you cannot apply any other change packages during that operation.
397