[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Best method to replace a branch's code
From: |
Derek Robert Price |
Subject: |
Re: Best method to replace a branch's code |
Date: |
Wed, 24 Mar 2004 12:01:10 -0500 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 |
-----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: address@hidden
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-----
- Re: Best method to replace a branch's code, (continued)
- Re: Best method to replace a branch's code, Derek Robert Price, 2004/03/24
- Re: Best method to replace a branch's code, Derek Robert Price, 2004/03/24
- Re: Best method to replace a branch's code, Larry Jones, 2004/03/24
- Strange Characters, Gagneet Singh, 2004/03/25
- Re: Strange Characters, Mark D. Baushke, 2004/03/25
- RE: Strange Characters, Gagneet Singh, 2004/03/25
RE: Best method to replace a branch's code, Fouts Christopher (6452), 2004/03/24
RE: Best method to replace a branch's code, Fouts Christopher (6452), 2004/03/24
RE: Best method to replace a branch's code, Andy Jones, 2004/03/24
RE: Best method to replace a branch's code, Jim.Hyslop, 2004/03/24
- Re: Best method to replace a branch's code,
Derek Robert Price <=
RE: Best method to replace a branch's code, Euan Guttridge, 2004/03/25