From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: "Priedhorsky, Reid" <reidpr@lanl.gov>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: bug? round-trip through fast-import/fast-export loses files
Date: Tue, 21 Mar 2023 10:07:53 -0700 [thread overview]
Message-ID: <xmqqh6uejamu.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BEG+vp-UcpVfcZecPBnfcuTjO6JYCo7wEU5ZrDUHBUd9g@mail.gmail.com> (Elijah Newren's message of "Mon, 20 Mar 2023 18:57:21 -0700")
Elijah Newren <newren@gmail.com> writes:
> Honestly, looking back at those two patches of mine, I think both were
> rather suboptimal. A better solution that would handle both F->D and
> D->F would be having fast-export sort the diff_filepairs such that it
> processes the deletes before the modifies. Another improved solution
> would be having fast-import sort the files given to it and handling
> deletes first. Either should fix this.
Reminds me of the trick we had to invent for "git apply", where we
process deletions first and then creation, to avoid the exact
problem of creating "foo" while removing "foo/bar" ;-)
next prev parent reply other threads:[~2023-03-21 17:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 17:10 bug? round-trip through fast-import/fast-export loses files Priedhorsky, Reid
2023-03-21 1:57 ` Elijah Newren
2023-03-21 15:54 ` Priedhorsky, Reid
2023-03-21 17:07 ` Junio C Hamano [this message]
2023-03-21 18:31 ` Jeff King
2023-03-22 3:07 ` 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=xmqqh6uejamu.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=reidpr@lanl.gov \
/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