Description - Mks.com

The change package you ask Source Integrity to use may or may not contain entries (that is, files),
but for the greatest level of control in isolating a feature or issue, it is preferable to start with an
empty change package.
The process for creating a resolution change package is as follows:
1. You create a normal change package and, during a Resync CP operation, you ask Source
Integrity to use it as a resolution change package for recording all conflicts.
2. Source Integrity takes the specified change package and adds a resolution list, thereby
making it into a resolution change package.
3. Once all the merge conflicts are addressed, you can check in the changes to the newly
created resolution change package.
4. After all the changes are checked in, you can then close the resolution change package, just
as you would do for a normal change package.
5. Apply the change package.
Note: If reviews are mandatory, you must submit the resolution change package (you cannot close
it manually). Submitting the resolution change package causes Source Integrity to apply the
change package using the si applyCP command. If reviews are mandatory, the apply CP
command records the applied changes in another change package that then follows the review
process
Are There Any Limitations When Using a Resolution CP?
To avoid the problem of overlaps and conflicts during the Apply CP operation, you can only apply
one resolution change package per operation.
For more detailed information and examples on si resynccp and resolution change packages,
see Applying Change Packages in the Source Integrity Enterprise User Guide.
Propagation Change Packages
During an Apply CP operation, your review of the changes you want to apply to a project may
reveal potential merge conflicts or conflicts from files that have been added, dropped, renamed, or
moved. For example, if a member has been removed from the source project, the Apply CP
process re-adds the member to the project you are updating, creating an undesirable structural
conflict.
Resolving structural conflicts call for a propagation change package. Similar to a resolution change
package, a propagation change package is initially constructed and populated using the Resync
CP operation with deferred operations for members that need to be updated. Once the propagation
change package is created, any conflicting entries can be discarded or corrected as needed prior
to submission. As an alternative to a resolution change package, a propagation change package
210 of 457