From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 11 May 2009 08:34:55 GMT
Subject: Re: [BUG] fatal error during merge
Message-ID: <alpine.DEB.1.00.0905111033400.27348@pacific.mpi-cbg.de>
In-Reply-To: <41870.bFoQE3daRhY=.1242027423.squirrel@webmail.hotelhot.dk>

Hi,

On Mon, 11 May 2009, Anders Melchiorsen wrote:

> On Sun, 10 May 2009 18:33:36 +0200, Alex Riesen <raa.lkml@gmail.com> wrote:
> 
> > I still have the patch below (rebased) in my tree.
> > Was the problem fixed somehow differently?
> 
> > Subject: [PATCH] Update index after refusing to rewrite files unchanged
> > during merge
> 
> I tested recently, and it does not appear to be fixed yet.
> 
> However, your patch was not enough to fix my test case completely,
> so I am unsure whether it makes sense to apply it as a partial fix.
> 
> The test is here:
> 
>    http://article.gmane.org/gmane.comp.version-control.git/116999

Maybe you can turn this into a patch adding a test (with 
test_expect_failure to mark it as a bug)?  This would make debugging a lot 
easier, as a non-installed Git could be tested.

Ciao,
Dscho