Re: [PATCH RFC] Test for apparent regression of merging renamed files

From: Elijah Newren <newren@gmail.com>
Date: May 4, 2011, 02:18 UTC
Message-ID: <BANLkTi=HR7CG0agR=cVMP3m6T-Y8dHP+4A@mail.gmail.com>
In-Reply-To: <BANLkTin6u8e4-x99JgN-D7FFJbO7pXVp-Q@mail.gmail.com>

Hi,

On Tue, May 3, 2011 at 1:15 PM, Ciaran <ciaranj@gmail.com> wrote:

Show 11 quoted lines

> On Mon, May 2, 2011 at 8:04 PM, Ciaran <ciaranj@gmail.com> wrote:
>> Provides a test to cover a case that appears to have been regressed out by:
>>
>>  b2c8c0a762745768e8fb249949801c1aed8f7c1d
>>
>> At this point no tags contain the above commit, but 'master' does.  I'm unsure
>> what is causing the issue, but can see discussion about this fix here:
>>
>> http://git.661346.n2.nabble.com/BUG-merge-recursive-triggered-quot-BUG-quot-td6179353.html
>>
>> Providing a patch to demonstrate the issue and spark discussion.

....

> The original behaviour (successful merge) seems 'better' than the
> current behaviour 'failed merge, 'erroneous' both modified flag' ...
> am I mis-reading this, is this a new non-supported edge case ?

Thanks for the testcase. This is clearly a bug; and a rather easy one to trigger at that. I'll have to take a look, though I suspect it's time to fix the deeper issues Junio pointed out previously...

Elijah