From: Jeff King <peff@peff.net>
Date: Thu, 22 Mar 2012 17:59:53 GMT
Subject: Re: Strange effect merging empty file
Message-ID: <20120322175952.GA13069@sigill.intra.peff.net>
In-Reply-To: <7vty1gy3eh.fsf@alter.siamese.dyndns.org>

On Thu, Mar 22, 2012 at 10:03:02AM -0700, Junio C Hamano wrote:

> > I was thinking the same thing. And it seems this came up once before,
> > and the list seemed to favor special-casing merge-recursive (but not
> > diffcore):
> >
> >   http://thread.gmane.org/gmane.comp.version-control.git/116917/focus=117082
> 
> Yeah, thanks for digging up the old thread. I was looking at the patch to
> merge-recursive from Dscho on that thread and I think it identified the
> place that needs patching correctly. I was on a tablet, without the access
> to the surrounding code outside the patch context, so I do not know if the
> logic to detect the pure-rename of an empty file in the patch was correct,
> or the patch still applies to the current codebase, though.

It's easy to apply the patch manually, and I have written a test.
However, it seems to cause lots of other parts of t6022 to fail. I'll
try to dig up the cause.

-Peff