From: "Priedhorsky, Reid" <reidpr@lanl.gov>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Cc: Elijah Newren <newren@gmail.com>
Subject: Re: bug? round-trip through fast-import/fast-export loses files
Date: Tue, 21 Mar 2023 15:54:03 +0000 [thread overview]
Message-ID: <6486D136-23D8-4C90-AEDA-DD037A5CD2B5@lanl.gov> (raw)
In-Reply-To: <CABPp-BEG+vp-UcpVfcZecPBnfcuTjO6JYCo7wEU5ZrDUHBUd9g@mail.gmail.com>
> On Mar 20, 2023, at 7:57 PM, Elijah Newren <newren@gmail.com> wrote:
>
> Thanks for the well-written bug report, including not only a testcase
> but even the relevant bits of the fast-export output.
😁
> 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.
In fact, the successful workaround in my own code is to re-order the fast-export output in exactly this way (i.e., sort the lines so all the D lines come before all the M lines).
> Another improved solution
> would be having fast-import sort the files given to it and handling
> deletes first. Either should fix this.
>
> Might be a good task for a new contributor. Any takers? (Tagging as
> #leftoverbits.)
Let me take a look, but I can’t guarantee anything.
HTH,
Reid
—
he/his
next prev parent reply other threads:[~2023-03-21 15:54 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 [this message]
2023-03-21 17:07 ` Junio C Hamano
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
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=6486D136-23D8-4C90-AEDA-DD037A5CD2B5@lanl.gov \
--to=reidpr@lanl.gov \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/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).