[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship
From: |
hendrik |
Subject: |
Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship |
Date: |
Sun, 4 May 2008 21:58:52 -0400 |
User-agent: |
Mutt/1.5.9i |
On Mon, May 05, 2008 at 10:29:08AM +1000, William Uther wrote:
> / \
> / \
> i a
> | |
> j b
> | |
> k c
> \ /
> \ /
> d
>
> With this setup, if anyone commits a child of k and then tries to
> merge, then they'll end up with the merge doing strange things.
> Files that existed in X should merge ok. (They'll do a a three
> way merge with k as the ancestor - that should be close enough.)
> Files that didn't exist in X will have been introduced separately
> in each side of the DAG and how they merge depends upon how d was
> generated. If d deleted the new nodes introduced in ijk then the
> new merge will warn about lost data, but will lose changes to those
> nodes.
Maybe
>
> X
> / \
> / \
> i |
> | |
> j |
> | |
> k |
| |
j |
| |
i |
| |
X |
\ /
\ /
a
|
b
|
c
|
> d
>
- Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship, (continued)
- Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship, Stephen Leake, 2008/05/04
- Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship, Derek Scherger, 2008/05/04
- Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship, William Uther, 2008/05/04
- Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship, William Uther, 2008/05/04
- Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship, Justin Patrin, 2008/05/04
- [Monotone-devel] Re: OpenEmbedded looking to jump ship, Koen Kooi, 2008/05/05
- Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship, William Uther, 2008/05/05
- [Monotone-devel] Re: OpenEmbedded looking to jump ship, Koen Kooi, 2008/05/06
- Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship, Thomas Keller, 2008/05/06
- Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship, Markus Schiltknecht, 2008/05/06
- Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship,
hendrik <=
[Monotone-devel] Re: OpenEmbedded looking to jump ship, Koen Kooi, 2008/05/02
[Monotone-devel] Re: OpenEmbedded looking to jump ship, Bruce Stephens, 2008/05/02
[Monotone-devel] Re: OpenEmbedded looking to jump ship, Holger Freyther, 2008/05/04