From: "Matthias Kestenholz" <mk@spinlock.ch>
To: "Pedro Melo" <melo@simplicidade.org>
Cc: git@vger.kernel.org
Subject: Re: Failed expectations or bug?
Date: Thu, 4 Sep 2008 12:18:28 +0200 [thread overview]
Message-ID: <1f6632e50809040318n2974cdf2t3664c759978dc8d3@mail.gmail.com> (raw)
In-Reply-To: <EA0C3F3E-0DA8-49A7-8151-5A2EC6C7BEEA@simplicidade.org>
On Thu, Sep 4, 2008 at 11:49 AM, Pedro Melo <melo@simplicidade.org> wrote:
> Hi,
>
> I was learning about git rename detection and came across a unexpected
> result. See the following sequence:
>
> [...]
>
> Maybe I have the wrong expectations, but after the merge I was expecting
> either:
>
> * b and c have the same content, with the modified D;
> * b has the modifications made in master, and c has the original content.
>
> I did not expect the patch to 'a' in master to propagate across the copy to
> c.
>
> What am I doing wrong here?
>
The rename detection needs more than a single character to work reliably.
If you do roughly the same test but with bigger files you should get better the
results.
Matthias
prev parent reply other threads:[~2008-09-04 10:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-04 9:49 Failed expectations or bug? Pedro Melo
2008-09-04 10:18 ` Matthias Kestenholz [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=1f6632e50809040318n2974cdf2t3664c759978dc8d3@mail.gmail.com \
--to=mk@spinlock.ch \
--cc=git@vger.kernel.org \
--cc=melo@simplicidade.org \
/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).