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 18:44:09 -0400 Organization: GNU Message-ID: <87d04e54cm.fsf@gnu.org> References: <87wo2m80nh.fsf@petton.fr> 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="3577"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) 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 00:44:48 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 1k0uoa-0000oU-0t for ged-emacs-devel@m.gmane-mx.org; Thu, 30 Jul 2020 00:44:48 +0200 Original-Received: from localhost ([::1]:55098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uoZ-0003Yl-5F for ged-emacs-devel@m.gmane-mx.org; Wed, 29 Jul 2020 18:44:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uo2-000397-43 for emacs-devel@gnu.org; Wed, 29 Jul 2020 18:44:14 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:55208) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uo1-0005AQ-Og; Wed, 29 Jul 2020 18:44:13 -0400 Original-Received: from [2607:fea8:3fe0:17d::7] (port=34718 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k0unz-0005tz-Gw; Wed, 29 Jul 2020 18:44:12 -0400 Mail-Followup-To: Nicolas Petton , "Emacs Devel" , Eli Zaretskii 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:253332 Archived-At: --=-=-= Content-Type: text/plain Hello, Nicolas Petton writes: > Hi, > > 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. > > I'm really sorry about this, it has made a big mess in the emacs-27 > branch. > > I thought branches were protected against force-pushing, so I'm not sure > what is the best way for me to fix my mistake. > > Nico I suggest we all STOP pushing anything to any branches of the emacs.git repository *immediately*, until Eli and our git experts see and chime in this thread, and until we figure this out. I think the most important question at this point is: can this change be effectively and reasonably reversed, or is the emacs.git repository and its emacs-27 branch on Savannah irreversibly messed up / cluttered? If the answer to the above is no, we will probably have to get Savannah hackers and the FSF sysadmins involved, to help us restore Savannah's copy of emacs.git to an earlier snapshot if any. Documentation on the Savannah administration wiki [0] suggests that Savannah data is backed up by the FSF daily. I hope that's accurate/up-to-date. [0]: https://savannah.gnu.org/maintenance/Backup/ --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCAAuFiEEObM8jZRIDS3cwqSYi0Sgzce5VvIFAl8h+7kQHGJhbmRhbGlA Z251Lm9yZwAKCRCLRKDNx7lW8sU/D/9mwaks7j5UiNbidpcejQQ0/rFKCwkPDtBz N5LUUtt5K/I94/mbEa+6KilMEgc9T2wycOd9/hKYudwXUwFmTojkoJbafaJkyIhX vLi9igxcptPaisqi4or80cjZdKiAcluYX9fLGoN67FIFGwRZyq9plJJQTyN0Yw4k fR5/B4iLqtebCP1Ds1xarFZIO75iGmGvXBc0ZwRPX/+w5hi0O7xsoLZp3gy5r3G5 XmYfNi5fPsi69wOuUPEtavEBPDc0g1inf898RV5VCo2D8VzBHIlj+XEbT/zhU5Hl 4diBd+nTSZ0hlgFN3cBUwwd6wCNTeV4jlb2vCVfUOXHN+SMVmwYvMqLErjHcOLgY ZMpfqFcUzzqhQ7fjUY7CMZQCiifGx8TZT+7wJ3Wo/ls/wy4dC2u89bsEAdXgGRmQ YYggpvMlJBuG+M7J5BQ8kjXsT3fvJDoXJRa8XdmCHyx2KMohOcqwB+rCUtytQmBF +FXNHo8I1Y8TM9+ogJpZQ8LjySxLSM4YwjGb7+lQTdnowTme5J4nge2jHGcQZk7C NSxUaTfcFJ3maDocr7ObeRq01kpsIYGZ1EKhdlJRBVvyi9OxAegMsveb5qKM8Wtg xkDIpTXJGCNv3oSFDLToZIWBBpaqYfjjjlziZ0GnEvubA0tM4K3eLWChuIMNG20Y lEi7bsPYYA== =ODrI -----END PGP SIGNATURE----- --=-=-=--