[Top][All Lists]

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

Re: make branch as trunk

From: Kaz Kylheku
Subject: Re: make branch as trunk
Date: Tue, 25 Jun 2002 14:09:18 -0700 (PDT)

On Tue, 25 Jun 2002, Katya Rubanov wrote:

> Date: Tue, 25 Jun 2002 12:34:52 -0700 (PDT)
> From: Katya Rubanov <address@hidden>
> To: address@hidden
> Subject: [info-cvs] make branch as trunk
> Branch X has been created off the trunk.  Development
> has been going on Branch X only, with hardly any
> changes on the trunk.  Branch X has new functionality
> and all the software upgrades.  Code has been merged
> from trunk to Branch X to keep X up-to-date.  We want
> to now make Branch X as the trunk.  
> A merge from Branch X to trunk will create a lot of
> conflicts and we want to avoid that.  

Note that this belief is inconsistent with your earlier assertion 
that there are ``hardly any changes on the trunk''. 

> Can you please suggest how we can force Branch X to
> become the trunk?

One way is to patch the delta between the trunk tip
and the branch onto the trunk.

    cvs co -j HEAD -j big-branch module

That should give you a working copy on the trunk 
which is equal to the branch. You can verify that this
is the case:

    cd module
    cvs diff -r big-branch    # should be no output!

Then you need to commit, of course.

Meta-CVS: solid version control tool with directory structure versioning.

reply via email to

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