zsh-workers
 help / color / mirror / code / Atom feed
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Cc: linuxtechguy@gmail.com
Subject: Re: Repository/mirrors question
Date: Mon, 24 Jan 2022 05:47:54 +0000	[thread overview]
Message-ID: <20220124054754.GA31935@tarpaulin.shahaf.local2> (raw)
In-Reply-To: <Ye3vYDN4q+IiCVGW@fullerene.field.pennock-tech.net>

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.&lt;br&gt;To discard the
    local changes and overwrite the branch with the upstream version,
    delete it here and choose &#39;Update Now&#39; 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


      parent reply	other threads:[~2022-01-24  5:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-22 19:15 Jim
2022-01-22 19:24 ` Bart Schaefer
2022-01-23 21:42   ` Jim
2022-01-24  0:14     ` Phil Pennock
2022-01-24  0:32       ` Bart Schaefer
2022-01-24  5:47       ` Daniel Shahaf [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220124054754.GA31935@tarpaulin.shahaf.local2 \
    --to=d.s@daniel.shahaf.name \
    --cc=linuxtechguy@gmail.com \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).