> On Mar 20, 2023, at 7:57 PM, Elijah Newren <newren@xxxxxxxxx> 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
