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: RCS, again: another removed functionality: undo last-checkin Date: Tue, 22 Sep 2015 20:49:27 +0900 Message-ID: <87mvwellmg.fsf@uwakimon.sk.tsukuba.ac.jp> References: <87oagx6tzz.fsf@mat.ucm.es> <55FF4026.2050004@yandex.ru> <83si68nu4i.fsf@gnu.org> <87eghsfd3m.fsf@fencepost.gnu.org> <83k2rknr2c.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1442922600 28197 80.91.229.3 (22 Sep 2015 11:50:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Sep 2015 11:50:00 +0000 (UTC) Cc: Eli Zaretskii , dak@gnu.org, emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Sep 22 13:49:44 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 1ZeM4t-0001dz-JP for ged-emacs-devel@m.gmane.org; Tue, 22 Sep 2015 13:49:43 +0200 Original-Received: from localhost ([::1]:38647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeM4t-0007BX-0S for ged-emacs-devel@m.gmane.org; Tue, 22 Sep 2015 07:49:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeM4p-0007B9-4C for emacs-devel@gnu.org; Tue, 22 Sep 2015 07:49:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZeM4o-0004uC-DP for emacs-devel@gnu.org; Tue, 22 Sep 2015 07:49:39 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:37909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeM4j-0004r7-4u; Tue, 22 Sep 2015 07:49:33 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id EA5B11C3867; Tue, 22 Sep 2015 20:49:27 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id BADDF11EF83; Tue, 22 Sep 2015 20:49:27 +0900 (JST) In-Reply-To: X-Mailer: VM undefined under 21.5 (beta34) "kale" cb65bfaf7110 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:190238 Archived-At: Richard Stallman writes: > I suggest that people (1) make a new VC command for undo-last-checking, > perhaps with a different name to move it out of the way, the (2) implement > it on whichever backends they can. The question is how many such commands do we need. In most VCSes, it is hard[1] to actually remove commits, and the only thing that can be done is to apply a reversed patch (git calls this "revert"). In others, there is a command to remove commits from a branch (git calls it "reset", and it's nondestructive; Mercurial calls it "strip", and it seems to be destructive). However, resetting a published branch is likely to cause all kinds of trouble when others pull and merge the reset branch with their own branches, and Eli suggests a third, DWIMish approach, which is to reset if the branch isn't public and to revert if it is. Footnotes: [1] You may need admin privileges or the like, or access to the repository host, etc.