From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: Removing rollback from VC mode - request for comment Date: Fri, 12 Dec 2014 09:21:12 +0900 Message-ID: <874mt1hg5j.fsf@uwakimon.sk.tsukuba.ac.jp> References: <20141211092138.6D5F6C008E@snark.thyrsus.com> <20141211123629.GA25499@thyrsus.com> <83fvcmtax5.fsf@gnu.org> <20141211170959.GA581@thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1418343724 22029 80.91.229.3 (12 Dec 2014 00:22:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 12 Dec 2014 00:22:04 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 12 01:21:57 2014 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 1XzDzZ-00049w-91 for ged-emacs-devel@m.gmane.org; Fri, 12 Dec 2014 01:21:57 +0100 Original-Received: from localhost ([::1]:54802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDzY-0008N9-Q4 for ged-emacs-devel@m.gmane.org; Thu, 11 Dec 2014 19:21:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDzG-0008N3-9c for emacs-devel@gnu.org; Thu, 11 Dec 2014 19:21:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzDzA-0004T6-CX for emacs-devel@gnu.org; Thu, 11 Dec 2014 19:21:38 -0500 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:32888) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDyz-0004LX-LA; Thu, 11 Dec 2014 19:21:21 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id EBA0E1C38F9; Fri, 12 Dec 2014 09:21:12 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id C84701A2CFC; Fri, 12 Dec 2014 09:21:12 +0900 (JST) In-Reply-To: <20141211170959.GA581@thyrsus.com> X-Mailer: VM undefined under 21.5 (beta34) "kale" acf1c26e3019 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:179850 Archived-At: Eric S. Raymond writes: > Eli Zaretskii : > > IMO, if VC is to win hearts on the Git front, it should grow more > > features, not less. It is IMO sad, if not ridiculous, that I cannot > > uncommit the last commit, and have to go outside Emacs for that. > > That is not a bad argument in general. Actually it's the best I've > seen for keeping and extending rollback. Except that the term itself is inconsistent with standard database terminology, where rollback aborts an in-progress transaction, i.e., is basically equivalent to "git reset --soft HEAD". I've always found that confusing. AFAICT, hg's rollback command, while it will destructively strip a commit (to preserve the commit as a bundle, hg provides the intuitively named "hg strip"), is really more intended to abort and rollback merges with "too complicated" conflicts and the like *before* committing. I understand that vc has provided rollback "forever", but if you decide to take Richard's suggestion of removing rollback's code and providing a complete replacement, think about renaming the functionality.