From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, spearce@spearce.org, agladysh@gmail.com
Subject: Re: [PATCHv3 5/6] fast-export: Fix output order of D/F changes
Date: Wed, 07 Jul 2010 23:04:44 -0700 [thread overview]
Message-ID: <7voceiqzk3.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <AANLkTiklqqxUhTBd4In-VQed_SMQ6X0nk2j2ysE20bmD@mail.gmail.com> (Elijah Newren's message of "Wed\, 7 Jul 2010 22\:36\:38 -0600")
Elijah Newren <newren@gmail.com> writes:
>>> We correct the order by instructing the diff_tree machinery to compare
>>> entries using df_name_compare instead of base_name_compare.
>
> Doh! Yep, you're right. My patch would not handle that case
> correctly.
If all you want is to force a particular order of paths in the output
(e.g. depth first) in this one single application, the cleanest way might
be to let the diffcore do its work and at the very end sort the elements
in the diff_queued_diff to your liking (c.f. diffcore_fix_diff_index()
that uses diffnamecmp() to sort the list).
next prev parent reply other threads:[~2010-07-08 6:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-07 5:20 [PATCHv3 0/6] D/F conflict fixes newren
2010-07-07 5:20 ` [PATCHv3 1/6] Add additional testcases for D/F conflicts newren
2010-07-07 21:25 ` Junio C Hamano
2010-07-08 3:07 ` Elijah Newren
2010-07-08 16:03 ` Junio C Hamano
2010-07-07 5:20 ` [PATCHv3 2/6] Add a rename + D/F conflict testcase newren
2010-07-07 21:26 ` Junio C Hamano
2010-07-08 5:04 ` Elijah Newren
2010-07-07 5:20 ` [PATCHv3 3/6] merge-recursive: Fix D/F conflicts newren
2010-07-07 21:40 ` Junio C Hamano
2010-07-08 4:34 ` Elijah Newren
2010-07-07 5:20 ` [PATCHv3 4/6] merge_recursive: Fix renames across paths below " newren
2010-07-07 5:20 ` [PATCHv3 5/6] fast-export: Fix output order of D/F changes newren
2010-07-07 21:40 ` Junio C Hamano
2010-07-08 4:36 ` Elijah Newren
2010-07-08 6:04 ` Junio C Hamano [this message]
2010-07-07 5:20 ` [PATCHv3 6/6] fast-import: Improve robustness when D->F changes provided in wrong order 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7voceiqzk3.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=agladysh@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=spearce@spearce.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).