User Guide - Mks.com

Chapter 12: Advanced Change Package Operations
Using a
Resolution CP
432
The MDT developer creates a change package.
The MDT developer makes the necessary changes and tests the code.
The MDT developer checks the modified files back into the variant
project, making sure to associate the files with change package 1204:1.
In this case, all the work of the MDT developer is now checked into the
variant development path and will be part of release 2.0a. However, what
is the best method for transferring the MDT bug fix work back to the main
development path so that it can be incorporated into the next product
release? The Resync CP command is the best option for applying the new
fix.
A PT developer can now create a second change package, 1204:2 for the
same issue. The second change package would include the summary
“Applied fix to main development path”. The PT developer would start
the Resync CP command, select the main development sandbox, and the
first change package—1204:1—in this issue. The second change package—
1204:2—would be used as a resolution change package.
Once all merges have been resolved, the developer submits the resolution
and Source Integrity applies the changes from the referenced change
packages.
The bug fix is now addressed in both the main and variant development
paths, ensuring that the problem is fixed in the Release 2.0a and the next
major product release.
The basic process for resolving conflicts is to apply the target change
package using the Apply CP command. If the Apply CP operation fails
because of a merge conflict, you must then use the Resync CP command to
create a resolution change package. That resolution change package is then
submitted, and Source Integrity applies the changes to the project.
The process involves the following key steps:
Use the Apply CP command to apply a change package to the main
trunk of development.
If Apply CP fails due to a required merge, use the Resync CP
command on the same change package and create a new 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.
u s e r g u i d e