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:37:45 +0300 Message-ID: <83eghsnp5y.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> <83fv28nq58.fsf@gnu.org> <87wpvkdvo8.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1442824993 16483 80.91.229.3 (21 Sep 2015 08:43:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Sep 2015 08:43:13 +0000 (UTC) Cc: dgutov@yandex.ru, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 21 10:43:04 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 1Zdwga-0003qM-Qt for ged-emacs-devel@m.gmane.org; Mon, 21 Sep 2015 10:42:56 +0200 Original-Received: from localhost ([::1]:56783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdwga-0006iP-Gg for ged-emacs-devel@m.gmane.org; Mon, 21 Sep 2015 04:42:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdwbd-0004xh-1l for emacs-devel@gnu.org; Mon, 21 Sep 2015 04:37:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdwbW-0004XU-Lu for emacs-devel@gnu.org; Mon, 21 Sep 2015 04:37:43 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:63169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdwbR-0004Wh-VW; Mon, 21 Sep 2015 04:37:38 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NV000M00PZG7V00@a-mtaout22.012.net.il>; Mon, 21 Sep 2015 11:37:36 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NV000LNGQMOVLB0@a-mtaout22.012.net.il>; Mon, 21 Sep 2015 11:37:36 +0300 (IDT) In-reply-to: <87wpvkdvo8.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:190180 Archived-At: > From: David Kastrup > Cc: emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru > Date: Mon, 21 Sep 2015 10:27:19 +0200 > > Eli Zaretskii writes: > > > OK, but what would you do instead, then, in the case where the commit > > is on "staged", but not yet on master? > > You fix staging. Fix how? This discussion is about the meaning of "rollback" for Git. So what I'm trying to figure out is whether there's some Git command other than "revert" that the user who pushed a bad commit to "staged" should perform to fix "staging". If there's nothing to be done locally, then "revert" is still a good interpretation of "rollback", even with the workflow you describe, because in that workflow the user simply should not invoke any rollbacks locally.