From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: RCS, again: another removed functionality: undo last-checkin Date: Mon, 21 Sep 2015 11:16:35 +0300 Message-ID: <83fv28nq58.fsf@gnu.org> References: <87oagx6tzz.fsf@mat.ucm.es> <55FF4026.2050004@yandex.ru> <83si68nu4i.fsf@gnu.org> <87eghsfd3m.fsf@fencepost.gnu.org> <83k2rknr2c.fsf@gnu.org> <876134favu.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1442823538 26293 80.91.229.3 (21 Sep 2015 08:18:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Sep 2015 08:18:58 +0000 (UTC) Cc: emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 21 10:18:49 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZdwJE-0006AX-P1 for ged-emacs-devel@m.gmane.org; Mon, 21 Sep 2015 10:18:48 +0200 Original-Received: from localhost ([::1]:56620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdwJE-00084Q-Gp for ged-emacs-devel@m.gmane.org; Mon, 21 Sep 2015 04:18:48 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdwHX-0005lr-C4 for emacs-devel@gnu.org; Mon, 21 Sep 2015 04:17:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdwHW-0002xA-9N for emacs-devel@gnu.org; Mon, 21 Sep 2015 04:17:03 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:43235) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdwHQ-0002vO-Rt; Mon, 21 Sep 2015 04:16:57 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NV000100P81T700@mtaout26.012.net.il>; Mon, 21 Sep 2015 11:19:31 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NV000G6ZPSJO760@mtaout26.012.net.il>; Mon, 21 Sep 2015 11:19:31 +0300 (IDT) In-reply-to: <876134favu.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:190177 Archived-At: > From: David Kastrup > Cc: dgutov@yandex.ru, monnier@iro.umontreal.ca, emacs-devel@gnu.org > Date: Mon, 21 Sep 2015 10:13:25 +0200 > > > Thanks, but would this mean that "git revert" for a commit pushed to > > the "staging" branch would be wrong? If so, can you explain why? > > It depends on whether the commit has moved to master already. If it > has, revert is the only option. If you noticed a mistake and want to > stop the commit from reaching master, you have to act fast enough that > the automated process will not make it progress into master. If the > commit has been stopped by the automated process, you definitely do not > want to add a revert on top of it to staging and have the combined > commit+revert reach master. OK, but what would you do instead, then, in the case where the commit is on "staged", but not yet on master?