From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 22 May 2008 12:50:32 GMT
Subject: Re: [PATCH 4/6] Restructure git-merge.sh
Message-ID: <alpine.DEB.1.00.0805221348500.30431@racer>
In-Reply-To: <alpine.DEB.1.00.0805221147550.30431@racer>

Hi,

On Thu, 22 May 2008, Johannes Schindelin wrote:

> On Wed, 21 May 2008, Junio C Hamano wrote:
> 
> > From: Sverre Hvammen Johansen <hvammen@gmail.com>
> > 
> > Restructure git-merge.sh for preparation of new feature:
> > 
> >        Head reduction before selecting merge strategy
> > 
> > Some aspects of this patch does not make much sense without
> > the next patch in this series.
> 
> As my student is pretty busy rewriting git-merge into a C builtin, can I 
> ask to hold this patch off?

Just to keep you updated: Miklos has a version of builtin-merge which 
passes all but three test scripts (in total, there are only 6 test cases 
that do not pass).

Given that the restructuring of git-merge.sh affects only the octopus case 
(IIRC...), I think it is not asked too much to redo the change in the 
builtin-merge, which should be easier, too.

Ciao,
Dscho