Re: I just pushed master into emacs-27

[Amin Bandali]

Hello,

Nicolas Petton <nico@petton.fr> 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/

signature.asc
Description: PGP signature