emaste at freebsd.org
Fri Apr 24 20:23:45 UTC 2020
On Fri, 24 Apr 2020 at 06:51, Ulrich Spörlein <uqs at freebsd.org> wrote:
> I think for a more recent example like r357366 it's pretty
> straightforward that it's a backout of a previous merge. How should
> this be dealt with in git? I think re-merging to a previous point of
> the git branch would lead to very hard to understand history.
Right, I think this should just be ignored in the git conversion, just
appear as a regular commit.
> I wonder if hoisting all the svn:mergeinfo into git notes would be
> feasible and useful.
I don't think it's useful.
> And then what are we to make of things like r345068? It "merely"
> renames/moves a directory within head but deletes 20 lines of
> Reverse-merges in the process? I guess it has to delete that
> mergeinfo, as the directory is being deleted (well, moved).
I think a change like r345068 should also be handled without anything
special related to mergeinfo.
More information about the freebsd-git