Thanks for everyone's comments.
I resolved the problem. But I can't figure out why the merge didn't occur
correctly. All the comments I received seemed to be along the same lines as
my approach, but something was screwy. Unfortunately, it was a high
priority, so instead of debugging and figuring out what was going wrong, I
manually fixed it.
Thanks again.
________________________________
Daniel Abner
Configuration Manager
Winfire, Inc.
Voice: (949) 576-5248
Fax: (949) 724-4839
mailto:dabner@corp.winfire.com
http://www.winfire.com
-----Original Message-----
From: Brandon Metcalf [mailto:bmetcalf@nortelnetworks.com
Sent: Thursday, September 28, 2000 12:34 PM
To: cciug@rational.com
Subject: [cciug] Re: Merge Help!
DAbner@corp.winfire.com writes:
da> I have to sub-branches off of main. I want to create a new sub-branch
da> off of main and merge these branches over to the new branch one at a
da> time. The first should be a trivial merge. The second may encounter
da> conflicts.
da>
da> Branches:
da> /main/dev1
da> /main/dev2
da> /main/dev_new
da>
da> I created the new branch and attempted to merge /main/dev1 to
da> /main/dev_new. Unfortunately the results were not what I wished. I
da> lost the changes made on /main/dev1.
da>
da> I used findmerge:
da>
da> In a /main/dev_new view I executed the following:
da>
da> cleartool findmerge file1 -nc -fversion /main/dev1/LATEST -merge
da>
da> Does anyone have any ideas on how to accomplish this? It's important
da> for me to preserve the branching scheme: I want branch "dev_new" to
da> branch off of main.
If you want dev_new to sprout from /main/LATEST, set a config spec that
looks like
element * CHECKEDOUT
element * .../dev_new/LATEST
element * /main/LATEST -mkbranch dev_new
then do a findmerge
ct findmerge -all -nc -fver /main/dev1 -print # or -merge
/main/dev1 implies /main/dev1/LATEST.
Brandon
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
This archive was generated by hypermail 2b29 : Sun May 06 2001 - 00:26:55 EDT