-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jim.Hyslop wrote:
>No, you will only get conflicts if you update from within the branch.
Fabi's
>approach will work, except you should probably add a step to delete all
>working files in B before copying files from A.
I'm telling you:
cvs up -rbranchA -jbranchA -jbranchB
cvs commit
No conflicts. No manual adding/removing. It just works.
Derek
- --
*8^)
Email: [EMAIL PROTECTED]
Get CVS support at <http://ximbiot.com>!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org
iD8DBQFAYb7WLD1OTBfyMaQRAmlYAKDfnFfyCPgjAKD+lxuxKaLSDu/HcACgnm0o
smbJk815oxs0QMEWrVaL1JM=
=/+ew
-----END PGP SIGNATURE-----
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
