Re: branch merging tactics (lock repository or not?)

[Eric Siegerman]

On Thu, Feb 28, 2002 at 02:22:13PM -0800, Paul Sander wrote:
> In other words, others have committed to your target branch before you
> finished resolving conflicts and committed your work, right?
> [...]
> This raises the issue of a race condition that is inherent in the
> concurrent development model, where you may have to ask your colleagues
> to hold their breath long enough for you to catch up and commit your
> work.

Uh huh.  Which is where it'd be nice to be able to lock the
branch in question, rather than the entire repo; to enforce the
holding of breath, but not hold up independent work.

Uh-oh, I can hear the flamethrowers firing up already...

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
One ring to rule the mall.
        - Movie review headline, eye Magazine