User Guide - Mks.com

Chapter 12: Advanced Change Package Operations
414
utility.c
Master Project
1.4
Archive for utility.c
1.4
1.3
1.2.1.2
1.2.1.1
1.2
1.1
CP 5:1
utility.c
Moving a patch from a variant project to a master project
Moving the patch from the variant to the master requires a three-way
merge operation using Resync CP. Apply CP would not be successful in
this case because merging is required. Similarly, because the master project
contains further new development, updating the head revision of
utility.c from 1.4 to 1.2.1.2 would not be appropriate. Updating the
head revision would cause the new development work in revisions 1.3 and
1.4 to be lost.
The Resync CP command should be used in this case. However, if the
correct options are not selected, the default Resync CP operation checks
out utility.c and overwrites revision 1.4 in your sandbox with
utility.c revision 1.2.1.2 from the variant project.
1.2
u s e r g u i d e
Variant Project
1.2.1.2
1.2.1.1