[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: Roger Ye
Subject: Re: How to merge changes made on a branch?
Date: Wed, 21 Dec 2005 22:04:36 +0800

Hi Jim,
Thanks for your help,

On 12/21/05, Jim Hyslop <address@hidden> wrote:
Hash: SHA1

Roger Ye wrote:
> Hi all,
> Here I have a branch prod_dev (not head), and prod_dev itself also has
> a branch named prod_dev_br, now some changes are made on the
> sub-branch prod_dev_br, and I want to merge the changes back to
> the branch prod_dev, and any changes made on the sub-branch should
> be ignored, then is it possible to execute a single cvs command to achieve
Here what I said is confusing, what I want is to overwrite prod_dev with
its sub-branch prod_dev_br.

> this? I have already checked out the project from branch prod_dev
> Afterwards can I use the following command to merge/override?
> cvs up -CdP -jprod_dev_br my-module
Yes, except that you don't specify 'my-module'.
Yes, you are right,

> Is it the same as the following one?
> cvs up -CdP -jprod_dev -jprod_dev_br my-module
Again, don't specify 'my-module'.

No, that will do something different: it will make prod_dev identical to
prod_dev_br, and you will lose any changes on prod_dev after the branch
was created.

> Or I must have a tag which marks where the sub-branch was made?
By specifying only one -j option, CVS will automatically determine where
the branch was made.
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?

> The second question is if lots of changes have been made on
> the sub-branch, especially in case of many new dirs and new files,
> how can I quickly commit all the changes to the branch prod_dev?
> how do you guys performed such operation?
'cvs ci' and you're done.
And here if there are a lot of new files/directories incorporated, can
"cvs ci" automatically add all of them, afterwards commit?
- --
Jim Hyslop
Dreampossible: Better software. Simply.
                Consulting * Mentoring * Training in
   C/C++ * OOD * SW Development & Practices * Version Management
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird -


Worry a little bit every day and in a lifetime you will lose
a couple of years. If something is wrong, fix it if you can.
But train yourself not to worry. Worry never fixes anything.
                                          -- Mary Hemingway

reply via email to

[Prev in Thread] Current Thread [Next in Thread]