[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ambiguous clean (was Re: [Monotone-devel] Re: [cdv-devel] more mergi
From: |
Tim Woodall |
Subject: |
Re: ambiguous clean (was Re: [Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...)) |
Date: |
Sat, 13 Aug 2005 18:55:46 +0100 (BST) |
On Thu, 11 Aug 2005, Bram Cohen wrote:
a
/ \
| b
| |
b a
b wins (implicit undo)
a
/ \
| b
| |
b c
c wins (convergence)
I'm not convinced here. I agree with the c wins (convergence) but the
other case looks bizarre. Consider:
a
/|\
b b b <- patch to mailing list (three developers pick it up)
| | |
a | a' <- dev1 & 3 realize it is a bad patch and back it out
| | | dev1 backs out with patch -R dev 3 backs out manually[1]
|/|\|
b | a' <- dev1 & 3 now merge with 2 who's been on holiday
And what happens when we merge the heads?
And would we expect a different result if everybody had merged after
applying the patch - i.e. the graph looks:
a
/|\
b b b
\|/
b <- everybody merges here to get a single head
/|\
a | a'
|/|\|
a | a'
[1] I think this is most likely to occur if dev3 first attempted to
"fix" the patch before backing it out.
Tim.
--
God said, "div D = rho, div B = 0, curl E = - @B/@t, curl H = J + @D/@t,"
and there was light.
http://tjw.hn.org/ http://www.locofungus.btinternet.co.uk/
[Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...), Timothy Brownawell, 2005/08/06
- Re: [Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...), Nathaniel Smith, 2005/08/07
- Re: [Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...), Timothy Brownawell, 2005/08/07
- Re: [Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...), Ross Cohen, 2005/08/07
- ambiguous clean (was Re: [Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...)), Nathaniel Smith, 2005/08/11
- Re: ambiguous clean (was Re: [Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...)), Bram Cohen, 2005/08/11
- Re: ambiguous clean (was Re: [Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...)),
Tim Woodall <=
- Re: ambiguous clean (was Re: [Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...)), Bram Cohen, 2005/08/13
[Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...), Bram Cohen, 2005/08/07
[Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...), Bram Cohen, 2005/08/07
[Monotone-devel] Re: [cdv-devel] more merging stuff (bit long...), Bram Cohen, 2005/08/07