Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: Repository/mirrors question
Phil Pennock wrote on Sun, Jan 23, 2022 at 19:14:24 -0500:
> On 2022-01-23 at 15:42 -0600, Jim wrote:
> > Aren't forks just copies of the git repository, once forked then the fork
> > does
> > their own thing. That wouldn't change the repository that the fork was taken
> > from, would it? 'man git' hasn't any references to forks. But it wouldn't
> > be
> > the first time I was wrong. What would concern me more is the object count
> > on gitlab's mirror.
>
> I'm going to answer the question and explain a few ways this can happen,
> but the last section below has the actual explanation of what's
> happening here: GitLab has one dev branch behind the others. Whoever
> owns that copy should take a look at why that branch wedged.
That'd be Oliver and I.
When I go to [1] it has a "diverged from upstream" warning label, in red
with a ⚠ next to it, and the following mouseover text:
"The branch could not be updated automatically because it has
diverged from its upstream counterpart.<br>To discard the
local changes and overwrite the branch with the upstream version,
delete it here and choose 'Update Now' above."
That does sound like the fallout of a forced push.
Reviewing the branch, everything on it is already on the sf.net copy of
the branch.
I've done what the mouseover text recommended. The tip of that branch
on gitlab is now identical to its tip on sf.
Cheers,
Daniel
[1] https://gitlab.com/zsh-org/zsh/-/branches?state=all&sort=updated_desc&search=declarednull
Messages sorted by:
Reverse Date,
Date,
Thread,
Author