From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Re: Removing rollback from VC mode - request for comment Date: Sat, 13 Dec 2014 08:41:55 -0500 Organization: Eric Conspiracy Secret Labs Message-ID: <20141213134155.GE2092@thyrsus.com> References: <20141211092138.6D5F6C008E@snark.thyrsus.com> <20141211183649.GE581@thyrsus.com> <20141212174501.GB26351@thyrsus.com> Reply-To: esr@thyrsus.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1418478148 6691 80.91.229.3 (13 Dec 2014 13:42:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 13 Dec 2014 13:42:28 +0000 (UTC) Cc: esr@snark.thyrsus.com, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 13 14:42:22 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 1Xzmxh-000747-9e for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 14:42:21 +0100 Original-Received: from localhost ([::1]:33068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xzmxg-0005Yn-UG for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 08:42:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzmxQ-0005Ye-Te for emacs-devel@gnu.org; Sat, 13 Dec 2014 08:42:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzmxI-0001cT-Rd for emacs-devel@gnu.org; Sat, 13 Dec 2014 08:42:04 -0500 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:52991 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzmxI-0001c6-NI; Sat, 13 Dec 2014 08:41:56 -0500 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id E4DBAC008E; Sat, 13 Dec 2014 08:41:55 -0500 (EST) Content-Disposition: inline In-Reply-To: X-Eric-Conspiracy: There is no conspiracy User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 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:179997 Archived-At: Richard Stallman : > > > That was always the reason I used vc-rollback, and it seemed to do > > > that job just fine. What's lacking? > > > Leaving the *modified* workfile in place rather than reverting it. > > That's not a bug, that's a feature. When I used C-x v c, I wanted to > cancel the last checkin and keep the current file contents. Then I > would do a new checkin. One of us is confused, possibly me. That's how Stefan and I meant it should work, too - that's what we mean by "uncommit". Maybe rollback worked that way at one time, but the RCS code before I deleted it said this: ;; Check out the most recent remaining version. If it ;; fails, because the whole branch got deleted, do a ;; double-take and check out the version where the branch ;; started. It was followed by co -u. So either it never worked the way all three of us think it should, or it did at one time but someone "corrected" it to leave the master and workfile in what they thought was a more coherent state. The latter seems not unlikely. -- Eric S. Raymond