Date: Sat, 28 Nov 2020 16:51:15 +0000 From: Rene Ladan <rene@freebsd.org> To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= <uqs@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: HEADS UP: freebsd-ports hashes were all changed Message-ID: <20201128165115.GA22587@freefall.freebsd.org> In-Reply-To: <X8I54bu%2Bw/lIAxQE@acme.spoerlein.net> References: <X8IzeXDKyDdQCbrB@acme.spoerlein.net> <X8I54bu%2Bw/lIAxQE@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Spörlein wrote:
> On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Spörlein wrote:
> >Hi folks, bad news
> >
> >While carving out the history of the access and mentors file (we want to
> >retain that for historical analysis, which people seem to do from time
> >to time), I overlooked that fact that the previous runs for ports did
> >contain all of CVSROOT, but the new one, by necessity would not contain
> >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT prefix
> >from the latest rules file. It should never have been there in the first
> >place. :(
> >
> >All that is to say that this of course means all the git commit hashes
> >for the ports tree have changed. Oops.
> >
> >Sorry about that, please let me know if you need help in transplanting
> >your work from old hashes to new hashes.
>
The web finds [1] which would translate to
git merge orgin main --allow-unrelated-histories
but I'm not sure if this is the correct hammer?
[1] https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L58-L68
René
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201128165115.GA22587>