[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Can you create a Branch from a tag on CVS form a tag in past time?

From: Pierre Asselin
Subject: Re: Can you create a Branch from a tag on CVS form a tag in past time?
Date: Tue, 18 Oct 2005 23:36:28 +0000 (UTC)
User-agent: tin/1.6.2-20030910 ("Pabbay") (UNIX) (NetBSD/2.0 (i386))

Farshad Mahjoubi <address@hidden> wrote:

> Let say a developer has worked off of trunk in the past and has not
> submitted his changes in Trunk, and we have released the code now and we do
> not want him to sumit to trunk now, and we need him to submit to a new Brach
> called Integration_Branch

So the developer has uncommitted code in a sandbox that is now hopelessly
out of date.  Here is what I would do.

The developer should create a branch to commit his work.  From his
out of date sandbox,

    1>  cvs tag oops_bp
    2>  cvs tag -b oops_branch
    3>  cvs update -r oops_branch
    4>  cvs commit

Command #1 places a tag on the revisions he started with.  Command
#2 creates the branch tag, command #3 places his sandbox on the
branch, and command #4 commits his changes on the new branch.  At
this point he can delete his sandbox since the changes are in CVS.
They are not on the branch you want but that's okay, the oops_branch
is just a place holder.

Next, he (or you or anyone else) gets a sandbox on the
integration branch where you want the changes to go.

    5> cd /some/where/else
    6> cvs checkout -r Integration_Branch the_project
    7> cd the_project

Bring in the changes

    8> cvs update -kk -j oops_bp -j oops_branch

This may create conflicts.  Fix them.  Build and test.
When satisfied,

    9> cvs commit

and the changes are now folded into the Integration_Branch, as

The oops_branch has served its purpose.  You should probably
leave it in the repository, but don't use it again.

pa at panix dot com

reply via email to

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