branching

[Kevin Buettner]

On Sep 19, 12:12pm, David Carlton wrote:

> And to merge changes in from mainline, here's what I might do, but I'm
> confused by it:
> 
> (All commands assume I'm in the branch's working directory, though it
> shouldn't matter for the first command.)
> 
> 1) Create a tag saying where the merges should end:
> 
>   cvs rtag carlton-dictionary-YYYYMMDD-tag gdb+dejagnu
> 
> 2) Merge in changes from my previous merge tag to the current merge
>    tag:
> 
>   cvs update -j carlton-dictionary-PreviousYYYYMMDD-tag
>     -j carlton-dictionary-YYYYMMDD-tag
> 
>    (The first time I do this, the first -tag will actually be
>    -branchpoint.)

Maybe I'm being naive, but why can't you just checkout your branch,
and then do:

    cvs update -j HEAD

Kevin