Date: Sat, 28 Nov 2020 13:41:02 -0700 From: Warner Losh <imp@bsdimp.com> To: Rene Ladan <rene@freebsd.org> Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org>, freebsd-git@freebsd.org Subject: Re: HEADS UP: freebsd-ports hashes were all changed Message-ID: <CANCZdfqPsjObRnNf2QN=0KmtWDHiVxUoe1zfHD_TxO1NptDkOw@mail.gmail.com> In-Reply-To: <20201128165115.GA22587@freefall.freebsd.org> References: <X8IzeXDKyDdQCbrB@acme.spoerlein.net> <X8I54bu%2Bw/lIAxQE@acme.spoerlein.net> <20201128165115.GA22587@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Nov 28, 2020 at 9:51 AM Rene Ladan <rene@freebsd.org> wrote:
> On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Sp=C3=B6rlein wrote:
> > On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Sp=C3=B6rlein 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 contai=
n
> > >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT prefix
> > >from the latest rules file. It should never have been there in the fir=
st
> > >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#L=
58-L68
>
I'm not sure either. What does your tree look like? Is it just tracking
upstream? Or do you have changes / branches?
Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqPsjObRnNf2QN=0KmtWDHiVxUoe1zfHD_TxO1NptDkOw>