Re: [PATCH] Use diff3 instead of merge in merge-recursive.

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Oct 18, 2006, 09:38 UTC
Message-ID: <Pine.LNX.4.63.0610181135120.14200@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <20061018085949.GA26501@cepheus.pub>

Hi Uwe,

On Wed, 18 Oct 2006, Uwe Zeisberger wrote:

> If no error occurs, merge (from rcs 5.7) is nothing but:
> 
> 	diff3 -E -am -L label1 -L label2 -L label3 file1 file2 file3 > tmpfile
> 	cat tmpfile > file1

Interesting. I wonder if we could streamline the code such that index_fd is called directly on the output of diff3? Of course, the result has to be removed when the call to diff3 fails.

Show 5 quoted lines

> I didn't made any timing tests or further tests for correctness, but I
> hope Johannes still has the framework from the time when he converted
> the Python script to C?  
> 
> @Johannes: If so, could you test this patch?

I have to dig a little where I have it, but I think I can give it a try in a few hours (imagine this lyrics to the melody of the day job blues).

Ciao, Dscho