From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 15 Jan 2009 03:36:41 GMT
Subject: Re: [RFC PATCH] Zooko's merge testcase
Message-ID: <alpine.DEB.1.00.0901150432530.3586@pacific.mpi-cbg.de>
In-Reply-To: <1231980818-24812-1-git-send-email-vmiklos@frugalware.org>

Hi,

On Thu, 15 Jan 2009, Miklos Vajna wrote:

> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
> ---

I think the idea can be simplified.  Given lines A, B, C in the base 
commit, one branch _prepending_ the same triplet, and the other branch 
changing the B to a D.

Only this time, nobody has a chance, even Darcs, because from the diff, 
you would not know if it was prepended or appended.

(Which happens to be the same problem as 3-way merge has with the example 
you were implementing; only when looking at the detailed history becomes 
it clear what was done.)

This all just proves again that there can be no perfect merge strategy; 
you'll always have to verify that the right thing was done.

Ciao,
Dscho