[tuhopuu-devel] CVS merging.

[Chris Want]

I'm not sure where you went wrong (dunno what the -ko
does in your merge command), but I made some notes one
time when I was merging, and
here they are:

<Hos>   tag tuhopuu: cvs tag -c PREMERGE_2004_02_14
<Hos>   get some recent bf-blender sources: cvs -z3 
-d:pserver:hos@cvs.blender.org:/cvsroot/bf-blender export -D now blender
<Hos>   GO INTO THE BLENDER DIRECTORY!!!: cd blender
<Hos>   merge the trees: cvs 
-d:pserver:hos@cvs.blender.org:/cvsroot/tuhopuu import -m "Merge of 
Blender/cvs 2004/02/14" tuhopuu2 BLENDER_DIST BLENDER_CVS_2004_02_14_2
<Hos>   fix the conflicts: cvs 
-d:pserver:hos@cvs.blender.org:/cvsroot/tuhopuu checkout 
-jBLENDER_CVS_2003_11_29 -jBLENDER_CVS_2004_02_14_2 tuhopuu2

The only thing I might add is that it would probably be good
to redirect stdin/stdout to a file during some of these commands.

Chris

P.S. you'll notice the _2 at the end of the tag above ... I screwed up
the first merge attempt by not going into the blender directory, and
hence the blender directory in tuhopuu2 ended up having a subdirectory
named blender containing the bf-blender sources ... oops!

Jonathan Merritt wrote:
> Hi Everyone,
> 
> This is slightly OT, but I'm asking the question here because people on 
> this list routinely have to tackle this problem with Tuhopuu. :-)
> 
> I recently attempted the first merge of BF-Tuhopuu into the 
> Aqsis-Tuhopuu repository.  I followed the steps outlined in the CVS 
> manual.  However, because the original import was done without a release 
> tag, I additionally tagged all files prior to the new (merge) import.  
> That seemed to be the right thing to do.  So, the steps I followed were:
> 
> 1. Tag existing Aqsis-Tuhopuu files in the Aqsis CVS:
>       cd ~/aqsis/tuhopuu2
>       cvs tag -c PRE_MERGE_1
> 2. Import from Tuhopuu in the Blender CVS to the Aqsis CVS:
>       cd ~/blender/tuhopuu2
>       cvs -d:... import -m "..." -ko tuhopuu2 BF MERGE_1
>    (NB: -d:... points to the Aqsis repository)
> 3. Perform the conflict resolution stage:
>       cd ~/aqsis
>       cvs -d:... checkout -j PRE_MERGE_1 -j MERGE_1 tuhopuu2
> 
> To my horror, I discovered that many of the changes in the PRE_MERGE_1 
> files had simply been lost, and these files had been replaced entirely 
> by their MERGE_1 counterparts (no <<<<<<<, ======= or >>>>>>>).  As a 
> temporary measure, I have simply copied the .#* files over their merged 
> versions, where those files are Aqsis-specific.  This latest commit 
> still compiles under Linux, but it doesn't fix the problem of why 
> apparently no attempt was made to merge files modified in the Aqsis 
> repository.
> 
> Does anyone know what I did wrong?  Why were the files simply replaced 
> and not at least marked with merge conflict signals (<<<<<<<, =======, 
>  >>>>>>>)?
> 
> One caveat here is that many of the files in the Aqsis-Tuhopuu tree were 
> originally imported into the repository in an altered state, and some 
> have not been altered since.  Could that be causing a problem?
> 
> If you can wrap your head around all of the above then I think you're 
> doing a very good job! :-)  Thanks,
> 
> Jonathan Merritt.
> _______________________________________________
> tuhopuu-devel mailing list
> tuhopuu-devel@blender.org
> http://www.blender.org/mailman/listinfo/tuhopuu-devel