info-cvs
[Top][All Lists]
Advanced

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

Re: Making a branch the trunk


From: Matt Herscovitch
Subject: Re: Making a branch the trunk
Date: Tue, 23 Apr 2002 11:05:12 +1000

Thankyou for your assistance - this worked perfectly (I was unable to do the join suggested earlier as I did not have a branch point tag).

Thanks,

Matt


From: address@hidden (Greg A. Woods)
Reply-To: address@hidden (CVS-II Discussion Mailing List)
To: "Matt Herscovitch" <address@hidden>
CC: address@hidden
Subject: Re: Making a branch the trunk
Date: Fri,  5 Apr 2002 13:47:36 -0500 (EST)

[ On Friday, April 5, 2002 at 17:24:17 (+1000), Matt Herscovitch wrote: ]
> Subject: Making a branch the trunk
>
> We have got ourselves into a situation where a branch has become the main > line of development and the trunk is no longer in use. In order to simplify
> our branching scheme I was wondering: is there is any way of easily
> transferring what is on a branch to the trunk?

The really easy way is the obvious way:

0. stop everyone from working and "cvs release" all working directories.

1. Check out a working directory on the branch.

2. Check out a working directory on the trunk.

3. Copy all the project files (i.e. not the CVS/* files!) from the
   working directory created in step #1 to the working directory created
   in step #2.

4. within the working directory created in step #2 "cvs add" any new
   files (show as '?' in "cvs -nq update") and "cvs remove" any old
   files (have timestamps older than the copy in step #3)

5. "cvs commit" in the working directory created in step #2

6. have everyone check out working directories on the trunk now and
   continue with their programming/maintaining/whatever....

--
                                                                Greg A. Woods

+1 416 218-0098; <address@hidden>; <address@hidden>; <address@hidden> Planix, Inc. <address@hidden>; VE3TCP; Secrets of the Weird <address@hidden>




_________________________________________________________________
Join the world’s largest e-mail service with MSN Hotmail. http://www.hotmail.com




reply via email to

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