cgit-beta ports repository diverged?

[Rene Ladan]

On Sat, Nov 28, 2020 at 03:07:14PM +0100, Ulrich Spörlein wrote:
> On Sat, 2020-11-28 at 13:40:45 +0000, Rene Ladan wrote:
> >On Sat, Nov 28, 2020 at 12:44:49PM +0100, Dimitry Andric wrote:
> >> On 28 Nov 2020, at 12:38, Rene Ladan <rene at freebsd.org> wrote:
> >> >
> >> > I just noticed that after doing a 'git pull' that the ports repository
> >> > at cgit-beta seems to have diverged:
> >> >
> >> >  rene at e17:/usr/freebsd/cgit-beta/ports % git status
> >> >  On branch main
> >> >  Your branch and 'origin/main' have diverged,
> >> >  and have 546213 and 528036 different commits each, respectively.
> >> >  (use "git pull" to merge the remote branch into yours)
> >> >
> >> >  It took 5.85 seconds to compute the branch ahead/behind values.
> >> >  You can use '--no-ahead-behind' to avoid this.
> >> >
> >> >  nothing to commit, working tree clean
> >> >  rene at e17:/usr/freebsd/cgit-beta/ports % git fetch
> >> >  rene at e17:/usr/freebsd/cgit-beta/ports % git pull
> >> >  fatal: refusing to merge unrelated histories
> >> >  rene at e17:/usr/freebsd/cgit-beta/ports %
> >> >
> >> > and what happened to those 18000 commits?
> >>
> >> I think you just missed Ulrich's heads-up mail :-)
> >>
> >> https://lists.freebsd.org/pipermail/freebsd-git/2020-November/000505.html
> >>
> >Yes, I was a bit too fast noticing myself ;)
> 
> Yeah, sorry about that. I typically test new rulesets on my own machine 
> and compare the results first, somehow I only did this for src when I 
> did the history for the `access` file and for ports it lives not under 
> svnadmin but under head/CVSROOT and I somehow didn't test that, wanting 
> to get the change out and over with.
> 
Uhm, `access` and `mentors` do live under svnadmin for ports, see
https://svnweb.freebsd.org/ports/svnadmin/conf/

There is no head/CVSROOT in ports.

René