[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: Tue, 20 Dec 2005 13:03:21 -0500
User-agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)

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

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

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

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


reply via email to

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