FW: [cvsnt] Re: Regresssion and branches in the current sand box?

[Siegfried Heintze]

Is it necessary to checkout a second sandbox for the trunk (as recommended
in the OReilly book) so I can add revisions to both the branch and the trunk
without merging them or replacing one with the other?

Apparently, if you want to merge or override changes immediately, one can
use the update command. It seems that both the -j and the -r for the update
command want to merge changes all the time. 

I want to keep the trunk and branches separate for a few revisions before I
merge them. Is it possible to do this with a single sandbox? I suspect not.

Thanks,
    Siegfried

-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf Of
Glen Starrett
Sent: Friday, October 01, 2004 11:53 AM
To: cvsnt at cvsnt.org
Subject: Re: FW: [cvsnt] Re: Regresssion and branches in the current sand
box?

Siegfried Heintze wrote:
> Now I want to add revisions to the trunk. So I do (as per Glen's
suggestion)
> 
> 
> "cvs update -j HEAD -j trunk"

Update -j means merge from that point to what you have, two -j's means 
merge the changes from first -j to second -j into what you have checked 
out.  -r is used to check out to a specific tag.


-- 
Glen Starrett
_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt