From: Caleb Cushing <xenoterracide@gmail.com>
To: Pieter de Bie <pieter@frim.nl>
Cc: git@vger.kernel.org
Subject: Re: BUG: git can't handle certain kinds of renames in merges
Date: Tue, 10 Mar 2009 15:51:00 -0400 [thread overview]
Message-ID: <81bfc67a0903101251r29e14154ud289646a1f5c20e0@mail.gmail.com> (raw)
In-Reply-To: <252A6411-2658-4DC6-A7F4-29CA3981F8FB@frim.nl>
On Tue, Mar 10, 2009 at 12:02 PM, Pieter de Bie <pieter@frim.nl> wrote:
> ind of toy examples. Git can't infer the file
> was renamed because almost nothing is similar enough. Take
> a look at the attached script and run it with 'sh test.sh'
> and 'sh test.sh real_test', and look at the difference.
I've got a much bigger example(hundreds of lines, and dozens change at
a time) which resolves in the same problem or worse with
git-tree-write errors. I'm trying to figure out now how to work around
this issue.
--
Caleb Cushing
http://xenoterracide.blogspot.com
prev parent reply other threads:[~2009-03-10 19:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-10 14:45 BUG: git can't handle certain kinds of renames in merges Caleb Cushing
2009-03-10 16:02 ` Pieter de Bie
2009-03-10 19:51 ` Caleb Cushing [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=81bfc67a0903101251r29e14154ud289646a1f5c20e0@mail.gmail.com \
--to=xenoterracide@gmail.com \
--cc=git@vger.kernel.org \
--cc=pieter@frim.nl \
/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).