Dan,
You need to take small steps to get there. I would do the following:
1) Create a new branch int2 at the same label, assuming that the dev2 branch
was created from a label. Perform the merge from dev1 to int2.
2) Create a sub branch, dev2a, off of dev2 and then merge int2 into dev2.
3) Then merge dev2a to dev_new.
This will reduce the scope of changes when going form dev1 to dev2 and then
finally to dev_new.
Good Luck,
Bert Robbins
-----Original Message-----
From: Dan Abner [mailto:DAbner@corp.winfire.com
Sent: Thursday, September 28, 2000 1:40 PM
To: ClearCase International Users Group (E-mail)
Subject: Merge Help!
Smart people, Help me!!
Here's the scoop:
I have to sub-branches off of main. I want to create a new sub-branch off
of main and merge these branches over to the new branch one at a time. The
first should be a trivial merge. The second may encounter conflicts.
Branches:
/main/dev1
/main/dev2
/main/dev_new
I created the new branch and attempted to merge /main/dev1 to /main/dev_new.
Unfortunately the results were not what I wished. I lost the changes made
on /main/dev1.
I used findmerge:
In a /main/dev_new view I executed the following:
cleartool findmerge file1 -nc -fversion /main/dev1/LATEST -merge
Does anyone have any ideas on how to accomplish this? It's important for me
to preserve the branching scheme: I want branch "dev_new" to branch off of
main.
Much appreciated!
Thanks,
Dan.
________________________________
Daniel Abner
Configuration Manager
Winfire, Inc.
Voice: (949) 576-5248
Fax: (949) 724-4839
mailto:dabner@corp.winfire.com
http://www.winfire.com
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
This archive was generated by hypermail 2b29 : Sun May 06 2001 - 00:26:55 EDT