[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: How to merge changes made on a branch?
From: |
Jim Hyslop |
Subject: |
Re: How to merge changes made on a branch? |
Date: |
Wed, 21 Dec 2005 13:19:40 -0500 |
User-agent: |
Mozilla Thunderbird 1.0.6 (Windows/20050716) |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Roger Ye wrote:
> Hi Jim,
>
> Thanks for your help,
You're welcome.
> Here what I said is confusing, what I want is to overwrite prod_dev with
> its sub-branch prod_dev_br.
Ah, this is covered in the FAQ:
http://ximbiot.com/cvs/wiki/index.php?title=CVS_FAQ#How_do_I_replace_branch_A_with_the_contents_of_branch_B.3F
> Here I have one more question, in my project, prod_dev_br is just a
> sub-branch
> of prod_dev, and there should be no change on prod_dev since the creation of
> its sub-branch prod_dev_br, therefore I think in this case using two -j will
> have
> the same result as with using one -j option, right?
Yes, if there have been no changes on prod_dev, then that's correct.
- --
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
iD8DBQFDqZy8LdDyDwyJw+MRAi3hAKCwMfkr6o4n2fwgCpBojjTSDyQQIwCgra9D
C5AvU9ZdZrcPOj5IskB6/5g=
=+UU8
-----END PGP SIGNATURE-----