From: John Goerzen <jgoerzen@complete.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Two bugs with renaming
Date: Wed, 19 Mar 2008 21:30:17 -0500 [thread overview]
Message-ID: <200803192130.17649.jgoerzen@complete.org> (raw)
In-Reply-To: <7vwsnyz07y.fsf@gitster.siamese.dyndns.org>
On Wednesday 19 March 2008 7:51:45 pm Junio C Hamano wrote:
> John Goerzen <jgoerzen@complete.org> writes:
> > # Now here comes bug #1...
>
> Please try 1.5.5-rc0 or newer. I think Linus's unpack_trees() updates,
> even though it was sort of a rocky road to get there, addresses this.
>
> Namely, v1.5.5-rc0~25 was the commit that fixed this issue.
Correct, bug #1 is gone with current git master.
>
> > # Set up bug #2
>
> This hasn't been addressed, I think.
Also correct. Bug #2 is still present with current git master. It shows:
jgoerzen@katherina:/tmp/testrepo$ git merge master
error: Entry 'files.upstream/delete.me' would be overwritten by merge. Cannot
merge.
fatal: merging of trees 5cec043802758b3a4cd617905c395a9f12bf89a2 and
9671b5181cb0649f39cfae372af1aed56a24010d failed
Merge with strategy recursive failed.
Is there any other information I can provide to assist with tracking that one
down?
-- John
next prev parent reply other threads:[~2008-03-20 2:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-19 23:21 Two bugs with renaming John Goerzen
2008-03-20 0:51 ` Junio C Hamano
2008-03-20 2:06 ` Jeff King
2008-03-20 2:30 ` John Goerzen [this message]
2008-03-20 0:56 ` Jeff King
2008-03-20 1:24 ` Björn Steinbrink
2008-03-20 4:12 ` Linus Torvalds
2008-03-20 4:22 ` Linus Torvalds
2008-03-20 4:45 ` Junio C Hamano
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=200803192130.17649.jgoerzen@complete.org \
--to=jgoerzen@complete.org \
--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).