diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-07-09 07:10:55 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-09 16:16:29 -0700 |
| commit | 060df624228187c77ca53a437ae0e9896076f045 (patch) | |
| tree | d95230936ae0662e6987e03e591ee43fb83d0caf /t/t5515-fetch-merge-logic.sh | |
| parent | merge_recursive: Fix renames across paths below D/F conflicts (diff) | |
| download | tgif-060df624228187c77ca53a437ae0e9896076f045.tar.xz | |
fast-export: Fix output order of D/F changes
The fast-import stream format requires incremental changes which take place
immediately, meaning that for D->F conversions all files below the relevant
directory must be deleted before the resulting file of the same name is
created. Reversing the order can result in fast-import silently deleting
the file right after creating it, resulting in the file missing from the
resulting repository.
We correct this by first sorting the diff_queue_struct in depth-first
order.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions