I am trying to merge a single proc from a branch Nov12
to main
. After searching in this reference I found the following should merge a copy from the branch to the main
Merge version 1 on the branch into the "latest" version in the "main" branch:
ct merge -to new_update.sql -insert -version /main/Nov12/1
After running this I got the output as
Trivial merge: "new_update.sql" is same as base "/home/mtk/ct/new_update.sql@@/main/Nov12/0".
Copying "/home/mtk/ct/new_update.sql @@/main/Nov12/1" to output file.
Output of merge is in "new_update.sql.merge".
the new_update.sql.merge
contains the complete proc on local disk, it's not in the clearcase version control. I did a ct lsh
to verify this.
I wanted it should have created a new version on the main and placed the updated copy into it i.e. /main/9 which not yet exists. The latest /main
version is 8.
So, how to merge a single proc. Do we need to checkout a copy from the main and then run the above command. Please let me know, I am not clear on this. I need a command line solution for this, as graphical alternative is not available.
You need to be in a view set to create version on /main
.
Instead, your merge wanted to create a version on Nov12
The page "To merge selective versions from a subbranch" details the merge you are using:
cleartool merge [ -graphical ] -to target-path -insert contributor-version-selector [contributor-version-selector]
But it also requires to check out the target version first.
That means that, even before your merge, you should see in the version tree a version created after your /main/8
one.
So try again your merge in the right target view, the one made to make new version on /main
.