Date: Fri, 24 Apr 2020 16:23:32 -0400 From: Ed Maste <emaste@freebsd.org> To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: SVN Reverse-merges Message-ID: <CAPyFy2A%2B3YrA0cx7gvveAh1U6MWYYr6nbZX-vJq8uAS%2BC7so%2Bg@mail.gmail.com> In-Reply-To: <CAJ9axoRAEMSufMv-5AjaN=JZqcu-nm0jTr1wu65yfZ94U6TrXQ@mail.gmail.com> References: <CAJ9axoRAEMSufMv-5AjaN=JZqcu-nm0jTr1wu65yfZ94U6TrXQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 24 Apr 2020 at 06:51, Ulrich Sp=C3=B6rlein <uqs@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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2A%2B3YrA0cx7gvveAh1U6MWYYr6nbZX-vJq8uAS%2BC7so%2Bg>