From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Bob Proulx Newsgroups: gmane.emacs.devel Subject: Re: I just pushed master into emacs-27 Date: Wed, 29 Jul 2020 20:31:22 -0600 Message-ID: <20200729201939376761021@bob.proulx.com> References: <87wo2m80nh.fsf@petton.fr> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LZvS9be/3tNcYl/X" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28379"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , Emacs Devel To: Nicolas Petton Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Jul 30 04:32:33 2020 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 1k0yMy-0007HE-W3 for ged-emacs-devel@m.gmane-mx.org; Thu, 30 Jul 2020 04:32:32 +0200 Original-Received: from localhost ([::1]:34744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0yMy-0002HC-2W for ged-emacs-devel@m.gmane-mx.org; Wed, 29 Jul 2020 22:32:32 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0yLv-0001ay-Cj for emacs-devel@gnu.org; Wed, 29 Jul 2020 22:31:27 -0400 Original-Received: from havoc.proulx.com ([96.88.95.61]:60814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0yLt-0001Ya-Ek; Wed, 29 Jul 2020 22:31:26 -0400 Original-Received: from joseki.proulx.com (localhost [127.0.0.1]) by havoc.proulx.com (Postfix) with ESMTP id 18AC75A8; Wed, 29 Jul 2020 20:31:23 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proulx.com; s=dkim2048; t=1596076283; bh=CopIRep207CFdrfpkeqvbHeGtzLfEvaSnzsLoIksHW4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pQ4sFx57sGP3odA+D9trf4I5Qmh0Z6R8ZTsmNVnATH81MiFCF3Yli1oLdr4LAPwe2 1yDt360mJG/yv6DSAjGcFF6R4+amEIvtyhrD962Mo4ITsxJLD6KxvD7D/v4eJyGzVJ BWY1vjycvkTf+K13BaKRJY4z8pJ+KLLLmbo5VAnSOgR4gv0p5hnVCPYHr4iUWaUHOn mjre5cy+Nu6V6lEi/fMfSQqywC+gyJkRSFGGmutqHKyySbV8t2bE/zUL2IyftumpSu RaVfnH7+dKPsSB2kL0YD1Mmuu4RWmCdTyAbIXijpRmoDai2xFdNzdj3dLS2XXFZNYE pZ0gzLjdcnEFg== Original-Received: from hysteria.proulx.com (hysteria.proulx.com [192.168.230.119]) by joseki.proulx.com (Postfix) with ESMTP id D619421144; Wed, 29 Jul 2020 20:31:22 -0600 (MDT) Original-Received: by hysteria.proulx.com (Postfix, from userid 1000) id ACF672DC9D; Wed, 29 Jul 2020 20:31:22 -0600 (MDT) Mail-Followup-To: Nicolas Petton , "Emacs Devel" , Eli Zaretskii Content-Disposition: inline In-Reply-To: <87wo2m80nh.fsf@petton.fr> Received-SPF: pass client-ip=96.88.95.61; envelope-from=bob@proulx.com; helo=havoc.proulx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/28 10:23:23 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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:253339 Archived-At: --LZvS9be/3tNcYl/X Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello Nico, Amin Bandali alerted me to the issues here. I am one of the Savannah Hackers and can help with some manual git adjustment on the repository side of things. Nicolas Petton wrote: > I just realized that I pushed master into the emacs-27 branch... I must > have rebased against master out of habit, like I always do on some other > git repositories. >=20 > I'm really sorry about this, it has made a big mess in the emacs-27 > branch. >=20 > I thought branches were protected against force-pushing, so I'm not sure > what is the best way for me to fix my mistake. Branches are protected against non-fastforward pushes. Which is a good thing for preventing loss of data due to accidents involving forced pushes. And is a good safety net for times like this too since we are assured that the repository hasn't lost anything. This is up to you to decide but I suggest that we manually reset the emacs-27 branch to the commit hash that it was before this problematic push. It's true that for any downstream sandbox that has already pulled from the branch that they will also need to manually reset their local sandbox branch too. But the earlier this is done the more limited in scope of the users for which will need to take this action. This is easily done on the superuser side of the repository. For paranoia and safety sake I would make a branch of the current emacs-27 branch named emacs-27-oops-2020-07-29 or something for a bit of time just as a safety backup just in case. It can be truly deleted later. Then simply reset the commit of the emacs-27 branch back to the previous known good one one. Then further pushes can happen just as normal on top of it. The only thing I would need to know is what is the git commit hash to reset the emacs-27 branch back to in order to be before this push? Let me know if that is what you would want to do. Or if there is a different action you would prefer be taken instead. We are happy to help! Bob --LZvS9be/3tNcYl/X Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEY7Fmg4Qc49wl08brQhr6Jjh/mo4FAl8iMPUACgkQQhr6Jjh/ mo5jPxAAm/XrnwoUBuokz4kF1S+UqhBywjx0iIKnm5WfvzMCOWT1h9VLF7rvziED MuVPmDe120Uq1t0rOrlnJJzYjSoPDwoF6Ov1kpNeaLI/R40frdxBJ+HWh+kTinpM DmRLMo1mqdGFFWzDOp8jDD93L0QVPJNFZ+2UpTnpYi0gKR160iK17xnrT5GoO0Gc Jma48+QKkv8XIJCKD+FMyNZkQtFJB0Ed3KaLPd+XGQ6VSIV9k0pntKQZSk8E3cC/ t6qQ2do+oOX7C7Y4hlWEnEHDY34n3Z8ndS/FBDoFihfERcfezFKyTFuOSli+o2p7 rLZKV56xAoMbJjCV9vYnQROjMYd3FAAJ/0n+5kDG39MnQNpV8vaxgLv+3aUpE6Dc FXH3G4lPmPTSQVZhGVl9iL/gy5+VZarRGtN5Q2zeH6aPp7To0EmTmsaGJg+ONcBy glnVFx1aoUOHfbII3qH2P+MWXcLMMdwecGZZ6xC3tRpGDXf29mhRng34U65vRc0P 1jL1UWnU/YUpPM/Pugg6LDDfWeB36w5rPQ0f/2a+Dm9zsgaPQXPw7R2Nr6UqWA3d et044+5CMJZ4Yy1DfYoqJp/l+C6zy8ueubAWdh5sabwwyMSrQBu5Zr+6Ab4qu5jK D+5dbi6LjzmEVzae26M+lOLrD9Feuxe2NDVMHGK6sROumBYh8WU= =w3Rq -----END PGP SIGNATURE----- --LZvS9be/3tNcYl/X--