From: Elijah Newren <newren@gmail.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] fast-export: ensure that a renamed file is printed after all references
Date: Tue, 7 Sep 2010 23:46:34 -0600 [thread overview]
Message-ID: <AANLkTim4iuDOG9U1epcafWarckaa6ZnxCOpfJW8KJW_m@mail.gmail.com> (raw)
In-Reply-To: <201009072133.02930.j6t@kdbg.org>
Hi,
On Tue, Sep 7, 2010 at 1:33 PM, Johannes Sixt <j6t@kdbg.org> wrote:
> t9350 sets up a commit where a file is both copied and renamed. The output
> of fast-export for this commit should look like this:
>
> author ...
> committer ...
> from :19
> C "file2" "file4"
> R "file2" "file5"
>
> The order of the two modification lines is derived from the result that
> the diff machinery produces.
>
> 060df62 (fast-export: Fix output order of D/F changes) inserted a qsort
> call that modifies the order of the diff result. Unfortunately, qsort need
> not be stable. Therefore, it is possible that the 'R' line appears before
> the 'C' line and the resulting fast-import stream is incorrect.
>
> Fix it by forcing that the rename entry is printed after all other
> modification lines with the same file name.
Patch and description looks good to me...however, I was a little
surprised to see no testsuite addition or additional explanation. Are
you seeing some t9350 tests fail on some platform despite passing on
linux?
Elijah
next prev parent reply other threads:[~2010-09-08 5:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-07 19:33 [PATCH] fast-export: ensure that a renamed file is printed after all references Johannes Sixt
2010-09-08 5:46 ` Elijah Newren [this message]
2010-09-08 18:47 ` Johannes Sixt
2010-09-08 19:26 ` Elijah Newren
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=AANLkTim4iuDOG9U1epcafWarckaa6ZnxCOpfJW8KJW_m@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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).