-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Urs Thuermann wrote: > [EMAIL PROTECTED] (Larry Jones) writes: > > >>Urs Thuermann writes: >> >>>Is it possible to change which branch should be the head? >> >>Only by completely redesigning and rewriting CVS and/or RCS. > > > OK, looking at revision files I think at least the file format would > support it without having to change it. > > >>That's why you should keep your main development on the trunk. > > > Sometimes you don't know in advance which branch will become the most > active one after some time. Then only merging the main development > back onto the trunk and creating a new branch for the development > which was on the the trunk previously seems to be the only solution. You don't have to merge them. You can swap the head and a branch with two simple "move branch" operations (see the FAQ entry, http://ximbiot.com/cvs/wiki/index.php?title=CVS_FAQ#How_do_I_replace_branch_A_with_the_contents_of_branch_B.3F
or http://tinyurl.com/7gh4t). cvs rtag original_head yourmodule cvs rtag -r yourbranch -b original_branch yourmodule cvs co yourmodule cd yourmodule cvs up -j HEAD -j original_branch cvs ci -m "Moved branch development onto the trunk" cvs up -r yourbranch cvs up -j yourbranch -j original_head cvs ci -m "Moved trunk development onto the branch" - -- Jim Hyslop Dreampossible: Better software. Simply. http://www.dreampossible.ca Consulting * Mentoring * Training in C/C++ * OOD * SW Development & Practices * Version Management -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFEOklXLdDyDwyJw+MRAu7LAKChICmu5BiEzlCF24fbLwclHzb1CwCg/pAH 4zJnS66omznOpDiIDgTlM3o= =quHp -----END PGP SIGNATURE----- _______________________________________________ info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
