Re: branching

[Daniel Jacobowitz <drow@mvista.com>]

On Thu, Sep 19, 2002 at 01:07:46PM -0700, Kevin Buettner wrote:
> On Sep 19, 12:35pm, David Carlton wrote:
> 
> > > Maybe I'm being naive, but why can't you just checkout your branch,
> > > and then do:
> > 
> > >     cvs update -j HEAD
> > 
> > Ah: maybe that's part of the answer: maybe I should do
> > 
> >   cvs update -j carlton-dictionary-YYYYMMDD-tag -j HEAD
> > 
> > (I'd missed the keyword HEAD.)
> > 
> > Section 5.7 of the CVS manual suggests that what you say isn't a good
> > idea, because it claims that CVS will try to merge in all changes to
> > head since the original branch, rather than all changes since I last
> > merged.
> 
> I see.  That sounds right.
> 
> > If that's accurate, I need to get tags on the head somehow so
> > that it doesn't try to merge in changes twice.
> 
> Maybe just keep track of the date of the last merge and do:
> 
>     cvs update -j HEAD:date -j HEAD
> 
> Another approach might be to use the -F option with ``cvs tag'' so that
> you only need one merge tag (for your branch) on the mainline.
> 
> (If you try the -j HEAD:date approach, let me know how it works...)

It should work fine... but if you do that, specify an explicit date on
both.  It makes it much simpler to do the next merge.

-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer