In article <007001c1de9d$77ad1c70$590aa8c0@GEORGEX>,
Rabbit Xu <[EMAIL PROTECTED]> wrote:
>-=-=-=-=-=-
>
>hello all:
> I use cvs and work in branch of cvs.now 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
it.
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
mrc
--
Mike Castle [EMAIL PROTECTED] www.netcom.com/~dalgoda/
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
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
