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 12:42:24 +0300 Message-ID: <83bncwnm67.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> <83eghsnp5y.fsf@gnu.org> <87si68du8h.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1442828627 8398 80.91.229.3 (21 Sep 2015 09:43:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Sep 2015 09:43:47 +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 11:43:32 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 1Zdxd6-0006RW-7r for ged-emacs-devel@m.gmane.org; Mon, 21 Sep 2015 11:43:24 +0200 Original-Received: from localhost ([::1]:57145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdxd5-00022f-Jq for ged-emacs-devel@m.gmane.org; Mon, 21 Sep 2015 05:43:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdxco-00021C-OW for emacs-devel@gnu.org; Mon, 21 Sep 2015 05:43:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zdxcn-0001Uz-Lg for emacs-devel@gnu.org; Mon, 21 Sep 2015 05:43:06 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:60882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdxch-0001Rw-Dz; Mon, 21 Sep 2015 05:42:59 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NV000300TLXWF00@a-mtaout23.012.net.il>; Mon, 21 Sep 2015 12:42:16 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NV0003DYTMEOUC0@a-mtaout23.012.net.il>; Mon, 21 Sep 2015 12:42:15 +0300 (IDT) In-reply-to: <87si68du8h.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.175 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:190183 Archived-At: > From: David Kastrup > Cc: emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru > Date: Mon, 21 Sep 2015 10:58:22 +0200 > > >> > 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? > > Remove the bad commit from the commit history. That's what we are > talking about the whole time. > > > 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". > > git reset --hard HEAD~1 in the simplest case. Or git rebase -i with a > selective removal of commits. Followed by a push, I presume? IOW, the 'staging" branch permits non-FF pushes? > > 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. > > But the usual thing is to "rollback", namely establish the _commit_ > state from before the bad commit, when encountering a staging-only > problem. > > Git's own development tree has "next", another branch which is > frequently being reset rather than have anything reverted in it. Other > projects have similar "tryout" branches. When you are using branches > for proposing patches (like the review tool Gerrit does), you are > supposed to _amend_ your proposals so that they look like they've been > done correctly right from the start, rather than adding fixes on top. > Again, this is rollback territory (or more frequently, git rebase -i > territory). It is only both public and non-ephemeral branches which > should not see history changes. So I guess we will have to provide a way for the user to tell VC which branch is of the "revert" type and which is of the "reset" type?