From: Elijah Newren <newren@gmail.com>
To: Ciaran <ciaranj@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH RFC] Test for apparent regression of merging renamed files
Date: Tue, 3 May 2011 20:18:40 -0600 [thread overview]
Message-ID: <BANLkTi=HR7CG0agR=cVMP3m6T-Y8dHP+4A@mail.gmail.com> (raw)
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:
> 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
prev parent reply other threads:[~2011-05-04 2:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-02 19:04 [PATCH RFC] Test for apparent regression of merging renamed files Ciaran
2011-05-03 19:15 ` Ciaran
2011-05-04 2:18 ` Elijah Newren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='BANLkTi=HR7CG0agR=cVMP3m6T-Y8dHP+4A@mail.gmail.com' \
--to=newren@gmail.com \
--cc=ciaranj@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).