[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: moving files from a branch to the Main trunk
|
From: |
Mike Castle |
|
Subject: |
Re: moving files from a branch to the Main trunk |
|
Date: |
Wed, 11 Jul 2001 12:14:44 -0700 |
|
User-agent: |
Mutt/1.3.18i |
On Wed, Jul 11, 2001 at 11:33:48AM -0700, Ketan Shah wrote:
> HI
>
> I have many files that are branched and have the tag "next_release".
>
> I would like to collapse this branch and have these files on the main
> trunk.
> so that when a developer checks out files he/she does not have to use
> the -r option.
cvs up -A
cvs up -j next_release
[resolve any conflicts]
cvs commit -m "merged in changes done on next_release branch"
--
Mike Castle address@hidden 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