Re: Best way to swap a branch with HEAD?

[Jim Hyslop]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Doug Lee wrote:
> This is accademic because I already did what I describe below, but I
> wonder if there would have been a better solution.
> 
> I had this long branch, which I'll call xp15 (a Windows XP branch amid
> NT branches actually), which was production-level code.  On the trunk,
> I had a lot of experimental code which was supposed to go production
> but never did.  Having learned since creating that arrangement the
> wisdom of doing things the other way (branch the experiments, leave
> the trunk a production source), I wanted to make HEAD again be the
> main development--in this case, continue from the tip of the xp15
> branch; and I wanted to move all the experimental stuff off onto its
> own branch, which I'll call exp here.

> I know no better way to handle this, but I thought I'd see if someone
> else does.

cvs rtag EXPERIMENTAL module

cvs co module
cd module
cvs update -jHEAD -jxp15
cvs ci

cvs update -r xp15
cvs update -jxp15 -jEXPERIMENTAL
cvs ci

done.

See FAQ 7.1
(http://ximbiot.com/cvs/wiki/index.php?title=CVS_FAQ#How_do_I_replace_branch_A_with_the_contents_of_branch_B.3F)
for an explanation how this works.

- --
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

iD8DBQFDp18gLdDyDwyJw+MRAq0kAJ4xnpaVfmfc4+PxTNMOEH1xU3UfXACdFHY7
lQsleOvbBoc8wtp4bXZngm4=
=cuOl
-----END PGP SIGNATURE-----