From: Jeff King <peff@peff.net>
To: Kevin Brannen <kbrannen@corp.hrsmart.com>
Cc: git@vger.kernel.org
Subject: Re: bug in merge
Date: Tue, 5 Jun 2012 01:23:12 -0400 [thread overview]
Message-ID: <20120605052312.GA16958@sigill.intra.peff.net> (raw)
In-Reply-To: <4FCCE306.9020600@corp.hrsmart.com>
On Mon, Jun 04, 2012 at 11:32:06AM -0500, Kevin Brannen wrote:
> I believe I've just found a bug in "merge", specifically in the
> "recursive" strategy. (Or really, here's another example of and
> hopefully more info on a known bug.) Oh, this is with 1.7.2.3, the
> latest I'm able to use on this machine.
> [...]
> So I think the problem is just too many renames/moves of the same
> object and when "recursive" descends the tree, it just can't handle
> that correctly -- or that's my guess. :)
There were a large number of merge-recursive corner cases fixed,
especially around renames, in the 1.7.3, 1.7.4, and 1.7.7 versions of
git. I do not recall specially a bug that matches your description, but
I would not be surprised at all if was already fixed by existing
changes.
Can you try to reproduce with a more recent version of git (preferably
the current "master" branch)?
-Peff
prev parent reply other threads:[~2012-06-05 5:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-04 16:32 bug in merge Kevin Brannen
2012-06-05 5:23 ` Jeff King [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=20120605052312.GA16958@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=kbrannen@corp.hrsmart.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).