On Mon, Jan 18, 2021 at 12:15:11PM -0800, Elijah Newren wrote: > If the intent was to keep merge-recursive.c indefinitely, then yes it > would. However, the intent is to (1) avoid touching merge-recursive.c > so I don't destabilize it and so folks can fall back to it, (2) get > merge-ort.c completed, and people to adopt and feel confident in it, > (3) delete merge-recursive.[ch]. > > This has come up a few other times in a review on the series, because > there are even examples of copied-and-unmodified functions; see > https://lore.kernel.org/git/CABPp-BGtpXRSz+ngFz20j8W4qgpb8juogsLf6HF7b0-Pt=s6=g@xxxxxxxxxxxxxx/ > and https://lore.kernel.org/git/CABPp-BEEoqOer11BYrqSVE9E4HcT5MNWcRm7ZHBQ7MVZRUDVXw@xxxxxxxxxxxxxx/. > I know it seems weird to intentionally repeat, but since the goal is > to nuke merge-recursive.c, I'm doing it as a temporary measure. That all makes sense, and is very helpful information to have. I'll keep it in mind as I continue to review this series. Thanks, Taylor
