[Top][All Lists]

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

Re: switch branch to main trunk ?

From: Mike Castle
Subject: Re: switch branch to main trunk ?
Date: Mon, 8 Apr 2002 12:24:29 -0800

In article <address@hidden>,
Rabbit Xu <address@hidden> wrote:
>hello all:
>  I use cvs and work in branch of I want to change this branch
>to main trunk and change original main trunk to a branch.
>  How to do?

The way you worded it makes me wonder *why* you want to do this.  Are you
sure you need to?

Meanwhile, taking your request literally, I see two ways of interpretting

One, you want to rotate branches.  Two, that you want to merge the branch
onto main then branch again.

In the first case, create a new branch off of main, then merge the old
branch onto main.  Something like this:

cvs up -A   # make sure on main branch
cvs tag newbranch_bp   # make a branch point tag for reference
cvs tag -b -r newbranch_bp newbranch   # create new branch
cvs up -j oldbranch   # merge changes from old branch onto main
   # do fixups here
cvs commit -m "merged oldbranch onto main"

In the second case, do something like:

cvs up -A
cvs up -j oldbranch
   # do fixups here
cvs commit -m "merged oldbranch onto main"
cvs tag newbranch_bp
cvs tag -b -r newbranch_bp newbranch

     Mike Castle      address@hidden
    We are all of us living in the shadow of Manhattan.  -- Watchmen
fatal ("You are in a maze of twisty compiler features, all different"); -- gcc

reply via email to

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