From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.devel Subject: Re: emacs-28 updated (970190b844 -> 41289a9fb9) Date: Tue, 26 Jul 2022 17:00:27 +0200 Message-ID: <878rof7wc4.fsf@gmail.com> References: <165884169379.13311.15849596681798970076@vcs2.savannah.gnu.org> <87czdr7wlk.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39015"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Emacs developers To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Jul 26 17:03:13 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oGM5Y-0009yG-7x for ged-emacs-devel@m.gmane-mx.org; Tue, 26 Jul 2022 17:03:12 +0200 Original-Received: from localhost ([::1]:45946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGM5W-00039X-MF for ged-emacs-devel@m.gmane-mx.org; Tue, 26 Jul 2022 11:03:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGM32-0000S1-OR for emacs-devel@gnu.org; Tue, 26 Jul 2022 11:00:37 -0400 Original-Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGM2x-0002Cl-5L for emacs-devel@gnu.org; Tue, 26 Jul 2022 11:00:33 -0400 Original-Received: by mail-wr1-x435.google.com with SMTP id g2so12487210wru.3 for ; Tue, 26 Jul 2022 08:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date :gmane-reply-to-list:references:in-reply-to:subject:cc:to:from:from :to:cc; bh=a4l/LoQe0r1ddtqXfPSlDOHDSQquyGVm3dYzPvM8H6E=; b=P7G5J8hxm6KhCUM9mGlIwmYNpv7vMWcmn4j0hdmdaU8Rq+MiLsX6Cbv6UBEOu9UwPA 1rR0gtGNgBkfCv/KIS+ZW7tuXACFmGMjH7F2wV0sJ9yQANTTf1TrWwQaVXrU6UmCtb+X Ia1NqtdZ+b7e1O7Qv2+eL2B3PWBRq3EPRo11eOuq99VgKA7WFnox8eYmv4kSUsy3REqB FgiwukpdKWvUorQl2+uXL5fzW9VOYAv6E+7oQUb6iUnzU0avfD4fz/9Hx1qZzQJUM3E8 sTesOLEDIK0hweuMgUKWAlbSYir0P00YczZF459GwkPQvoYY60ZJ1CsvaYmRUPWq+oIN 76ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date :gmane-reply-to-list:references:in-reply-to:subject:cc:to:from :x-gm-message-state:from:to:cc; bh=a4l/LoQe0r1ddtqXfPSlDOHDSQquyGVm3dYzPvM8H6E=; b=7yHzDzoREvMVor/BMgvDUroF0UpCL/T4MLatTzjr1BBxBffM6cWYkvRJuezdTIR/qA Fk+FoA58YZ04OQMHk0tTRdzNjmdAFBUn8Edvs4y3VJS1ho0pp08S//W3ElAnDA2bbg6I kya7VxyzRHYwzy0ao33OarnUBk8Zc3D9Im/p0I/HDPi9l4r223d2WOfHyQE+k1aFX211 Je0Pn2V9v02ShKhNzPo53Vpso0UXts9zff24zevgG4for0uxB59l3cPEoIuzgFKIuMDQ wz7kaw9FyeuSwPDcYF5U35kqgNC5Z99WifNV18ZkxMO58VF14Oe02HZT3NiPySlcfPPf AnmA== X-Gm-Message-State: AJIora+rPlJkvN6JoE60A6EuYBJmEcJNtFd3OHfQbZL/9usGSPyT27Y0 LoVsQNN7o5qLBkePnqi2NP/x/Y3Frhk= X-Google-Smtp-Source: AGRyM1sh8XbH3vNOo4XoL9PHfOewJWFcHoJVmhHfR12k6FK0eqIBeLhmVIvwn2fybq/J4b6eB612nw== X-Received: by 2002:a05:6000:706:b0:21e:a89e:f2a4 with SMTP id bs6-20020a056000070600b0021ea89ef2a4mr2083908wrb.122.1658847629002; Tue, 26 Jul 2022 08:00:29 -0700 (PDT) Original-Received: from rltb ([2a01:e0a:3f3:fb50:7834:6702:759c:618d]) by smtp.gmail.com with ESMTPSA id h13-20020a5d548d000000b0021d8b1656dfsm14862064wrv.93.2022.07.26.08.00.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 08:00:28 -0700 (PDT) In-Reply-To: <87czdr7wlk.fsf@gmail.com> (Robert Pluim's message of "Tue, 26 Jul 2022 16:54:47 +0200") Gmane-Reply-To-List: yes Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=rpluim@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:292697 Archived-At: >>>>> On Tue, 26 Jul 2022 16:54:47 +0200, Robert Pluim s= aid: >>>>> On Tue, 26 Jul 2022 15:28:55 +0200, Stefan Kangas said: Stefan> Ouch, this was wrong. :-/ I'm very sorry about that. Stefan> Who has the permissions to help revert this? I guess these ste= ps 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-forwar= d) Stefan> error: failed to push some refs to 'git.sv.gnu.org:/srv/git/ema= cs.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=CA=BCm 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 --=20