What does the error "Change package merge required" mean?

0 Likes

"PROBLEM/ABSTRACT:
What does the error "Change package merge required" mean?


SOLUTION:
The "Change package merge required" message is displayed when there is already a previous version of a file in the change package and the new version being added to the change package is not a descendant of that version. In this case, the latest version of the file added to the change package does not contain the changes previously associated with the change package.

Lets say that you have two development streams, StreamA and StreamB which have the same parent stream (i.e. they are siblings) and you have workspaces on both of those streams. You keep a version of foo.c in your StreamA workspace, promote the change to StreamA and associate the change with Change Package 10. You then keep a version of foo.c in your StreamB workspace, promote the change and attempt to associate the change with Change Package 10. Since the version of foo.c in StreamA is already in the change package and that change is not part of the version in StreamB (from an ancestry point of view), we do not allow you to add this new version to the change package without doing a merge from the StreamA version or removing the StreamA version from the change package.

We are planning to make this "merging" process easier and more automated in upcoming releases but need to at least warn you about this condition.


For more information contact AccuRev Support"

Comment List
Related
Recommended