From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Amin Bandali Newsgroups: gmane.emacs.devel Subject: Re: I just pushed master into emacs-27 Date: Wed, 29 Jul 2020 19:42:29 -0400 Organization: GNU Message-ID: <87tuxp51ne.fsf@gnu.org> References: <87wo2m80nh.fsf@petton.fr> <87d04e54cm.fsf@gnu.org> <87ft99oqeu.fsf@dick> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15550"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Emacs Devel , Nicolas Petton To: dick.r.chiang@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Jul 30 01:43:01 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 1k0viv-0003wb-QK for ged-emacs-devel@m.gmane-mx.org; Thu, 30 Jul 2020 01:43:01 +0200 Original-Received: from localhost ([::1]:42950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0viu-0005kh-SH for ged-emacs-devel@m.gmane-mx.org; Wed, 29 Jul 2020 19:43:00 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0viR-0005Kb-Qp for emacs-devel@gnu.org; Wed, 29 Jul 2020 19:42:31 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:56179) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0viQ-0004kL-Ve; Wed, 29 Jul 2020 19:42:30 -0400 Original-Received: from [2607:fea8:3fe0:17d::7] (port=35348 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k0viQ-0008S2-MR; Wed, 29 Jul 2020 19:42:30 -0400 Mail-Followup-To: dick.r.chiang@gmail.com, Nicolas Petton , Emacs Devel In-Reply-To: <87ft99oqeu.fsf@dick> 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:253336 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable dick.r.chiang@gmail.com writes: > AB> I suggest we all STOP pushing anything to any branches of the > emacs.git AB> repository *immediately* > > This is unduly alarmist. What happens in other branches is > independent of the emacs-27 branch. > I've been under the impression that in a Git repo, branches are lightweight pointers to commits stored in the repo. As such, my thought process was that if Nico's commits have had a more global impact (on the entire emacs.git repo) than just emacs-27, we may want to consider having Savannah hackers restore an earlier snapshot of the entire repo on the server side. With that in mind, my suggestion to temporarily suspend any pushes to the repo was so that we minimize changes that may have to be re-pushed if it is decided that restoring emacs.git on the server is necessary. That said, I'm no git expert, and I certainly was not trying to sound "alarmist". If all of this can 'simply' be reversed by a force push and without incurring any costs to emacs.git's internal state on Savannah, and as if this never happened, then great. I'm no fan of incurring unnecessary work onto the Savannah hackers and/or the FSF sysadmins. > > AB> its emacs-27 branch on Savannah irreversibly messed up / > cluttered?=20 > > Minimally, M. Petton (and probably others) will have a reflog commit with > emacs27's last pristine state before the force push, which he could "git > checkout -B" and re-force-push. Such is the distributed ethos of git, a > virtue Linus never fails to remind us of. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJDBAEBCAAuFiEEObM8jZRIDS3cwqSYi0Sgzce5VvIFAl8iCWUQHGJhbmRhbGlA Z251Lm9yZwAKCRCLRKDNx7lW8r57D/dudoSyUImI8KWRaMKPdLRnmZlX8hI6lAbw NpW68P72zZqQ/nnQbcLZyaZZ77jjqOGo5KoYq5Nw5yTvPt5YhMZnKg2rHCRzYdxu spLATgptZjv5VGgxNorXoBqi1Q+BCj9o7rnb24ok8vZ2HWghBqxJ53LnX0Lhsa5f XjqmJ85ebNJWNbOwuW4KhYAU8Zotvf9QEMxCitONw74NkYaGlDWuuUTJ/Pt5UUZy SyW9H1o7bbaBwLnXnQwPzM+gy9UvGVVIDGC98wJ8h2hN6CSBoTJJ9pO8B6h34GOj K2ihoDN7OLH16abvZWI0YM3aITY9EjoTT8QaGSjK8I/EJMhd8Ciq8B53Xv/yuzGj /KIqLEORo7hV43n5/tpHkWapy8t4fxk4DJW7f+GNHlb8xLBjpT548ZoKNbUaR8uo A2tGJ5ljTokcq8hotu0GJmhKWAe4Q+Uac+0N2B79ig6AZRwqcLIeGzq5aQIyt+H6 gpdbHceiPzphled1+YW56rBKblkCVMB/FKBKyhjKBH4AFW3Fz1LgiXYzsXmvRc2E vuSB19I+pK86F0HwFBarL/ZneayfIf6XxQ6CDZqrxqYs6/85rUIUwyagjiZi9JU1 dZHclP14h5WkRs9wjlB5nWFGiQ4KL5p6ykEdkKJPMCHZwanzlIrba/c2F3Ncngr0 qarPVq7k =W/TX -----END PGP SIGNATURE----- --=-=-=--