[Top][All Lists]

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

Re: Race condition merging branches

From: Eric Siegerman
Subject: Re: Race condition merging branches
Date: Mon, 27 Aug 2001 13:45:03 -0400
User-agent: Mutt/1.2.5i

On Mon, Aug 27, 2001 at 03:15:10PM +0200, Carel Fellinger wrote:
> I naively thought that the
> follwing would do:
>   cvs rtag -r branch branch_n
>   cvs update -j branch_n-1 -j branch_n
> but this obviously leaves out the stuff in branch_n [...]

This is wrong.  The stuff in the revisions labelled with the
"branch_n" tag is included in the merge.

What's excluded is the changes in the "branch_n-1"-labelled
revisions.  But that's what one wants; they were merged last
time, having been included in the:
        cvs update -j branch_n-2 -j branch_n-1


|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
With sufficient thrust, pigs fly just fine. However, this is not
necessarily a good idea.
        - RFC 1925 (quoting an unnamed source)

reply via email to

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