unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Robert Pluim <rpluim@gmail.com>
To: Stefan Kangas <stefankangas@gmail.com>
Cc: Emacs developers <emacs-devel@gnu.org>
Subject: Re: emacs-28 updated (970190b844 -> 41289a9fb9)
Date: Tue, 26 Jul 2022 17:00:27 +0200	[thread overview]
Message-ID: <878rof7wc4.fsf@gmail.com> (raw)
In-Reply-To: <87czdr7wlk.fsf@gmail.com> (Robert Pluim's message of "Tue, 26 Jul 2022 16:54:47 +0200")

>>>>> On Tue, 26 Jul 2022 16:54:47 +0200, Robert Pluim <rpluim@gmail.com> said:

>>>>> On Tue, 26 Jul 2022 15:28:55 +0200, Stefan Kangas <stefankangas@gmail.com> said:
    Stefan> Ouch, this was wrong.  :-/  I'm very sorry about that.
    Stefan> Who has the permissions to help revert this?  I guess these steps
    Stefan> would be necessary:

    Stefan> git reset --hard 970190b844
    Stefan> git push -f

    Stefan> I can't do it myself as I get:

    Stefan> $ git push -f
    Stefan> Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
    Stefan> remote: error: denying non-fast-forward refs/heads/emacs-28 (you
    Stefan> should pull first)
    Stefan> To git.sv.gnu.org:/srv/git/emacs.git
    Stefan> ! [remote rejected]       emacs-28 -> emacs-28 (non-fast-forward)
    Stefan> error: failed to push some refs to 'git.sv.gnu.org:/srv/git/emacs.git'

    Robert> At least scratch and feature branches can be deleted by pushing, so
    Robert> maybe

    Robert>     git reset --hard 970190b844
    Robert>     git push :emacs-28
    Robert>     git push

    Robert> (but Iʼm too chicken to try it :-) )

And of course that last step should be

    git push origin HEAD:emacs-28

(assuming your remote is called 'origin')

Robert
-- 



  reply	other threads:[~2022-07-26 15:00 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <165884169379.13311.15849596681798970076@vcs2.savannah.gnu.org>
2022-07-26 13:28 ` emacs-28 updated (970190b844 -> 41289a9fb9) Stefan Kangas
2022-07-26 14:54   ` Robert Pluim
2022-07-26 15:00     ` Robert Pluim [this message]
2022-07-26 15:07       ` Stefan Kangas
2022-07-26 15:12         ` Stefan Kangas
2022-07-26 15:48         ` Robert Pluim
2022-07-26 15:46   ` Eli Zaretskii

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

  List information: https://www.gnu.org/software/emacs/

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

  git send-email \
    --in-reply-to=878rof7wc4.fsf@gmail.com \
    --to=rpluim@gmail.com \
    --cc=emacs-devel@gnu.org \
    --cc=stefankangas@gmail.com \
    /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.savannah.gnu.org/cgit/emacs.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).