RE: Converting a branch into the main trunk

[Rudy Zung]

If you truly want a complete overwrite, update to the HEAD, then delete your
local files, then merge in the branch; this in effect makes CVS merge in all
the branch onto an empty local file, and everything that was the HEAD is
overwritten by the branch being merged in.

Of course, then commit.

...Ru


-----Original Message-----
From: Deever, Chris C. [mailto:address@hidden
Sent: Tuesday, November 07, 2000 8:31 AM
To: address@hidden
Subject: Converting a branch into the main trunk


When merging a development branch into the HEAD trunk, is it possible to
somehow insure that code development branch always overwrites the main trunk
completely?

Since CVS does a line by line diff comparison to determine what code to
merge, I'm a bit hesitant to do the merge since the two versions of code are
very different at this point.  I'd like to know that the code in the
development branch will always take precedence over code in the HEAD trunk.

Maybe there is a way to simply rename the branches?

Thanks,

Chris

_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs