Re: [PATCH] fast-export: ensure that a renamed file is printed after all references
- From
Elijah Newren <newren@gmail.com>
- Date
- Sep 8, 2010, 05:46 UTC
- Message-ID
- <AANLkTim4iuDOG9U1epcafWarckaa6ZnxCOpfJW8KJW_m@mail.gmail.com>
- In-Reply-To
- <201009072133.02930.j6t@kdbg.org>
Hi,
On Tue, Sep 7, 2010 at 1:33 PM, Johannes Sixt <j6t@kdbg.org> wrote:
Show 19 quoted lines
> 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