RE: [boost] Need help merging thread-initial into main trunk

From: Beman Dawes (bdawes_at_[hidden])
Date: 2001-09-25 16:21:31

At 03:41 PM 9/25/2001, Jim.Hyslop wrote:
 >David Abrahams [SMTP:david.abrahams_at_[hidden]] wrote:

 >> Note that this procedure writes over the main trunk revision with the
 >branch
 >> revision, without trying to merge. Maybe that's what you wanted; if so,
 >> fine.
 >Actually, in this case it is. The trunk revisions were all dead, it is 
safe
 >to simply move the branch revision into the trunk.
 >
 >Again, I must emphasize - in _this_ case, it is safe.
 >
 >> I wonder how the repository got into this condition?
 >Sorry, I neglected to provide my analysis of how this situation came 
about,
 >and how to replicate it. I examined the log files for the files in
 >question,
 >and discovered that the main trunk had been removed (using the cvs remove
 >command). The sequence of events to replicate this is:
 >
 >Create a new file, check it into the repository
 >Apply a branch tag
 >Remove the file from the repository
 >Check out the branch - CVS will happily retrieve it from the Attic
 >Modify the file and check it in
 >Check out the trunk
 >Attempt to merge
 >
 >I replicated the problem in our cvs-test area here at Leitch, and figured
 >out the steps required to fix the problem.

Yes, the main trunk got removed because we didn't want development code 
appearing in the main trunk.

We have some notes on how to create a branch without also creating a main 
trunk, but Dave just tested them and they don't appear to work 
anymore.  Dave's may try to develop a new procedure.

--Beman