From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: Removing rollback from VC mode - request for comment Date: Thu, 11 Dec 2014 12:57:18 +0100 Organization: Probably a good idea Message-ID: References: <20141211092138.6D5F6C008E@snark.thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418299242 30110 80.91.229.3 (11 Dec 2014 12:00:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 11 Dec 2014 12:00:42 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 11 13:00:35 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 1Xz2Q3-0003fA-Fy for ged-emacs-devel@m.gmane.org; Thu, 11 Dec 2014 13:00:31 +0100 Original-Received: from localhost ([::1]:50455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz2Q3-0000BH-1a for ged-emacs-devel@m.gmane.org; Thu, 11 Dec 2014 07:00:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz2Pi-00008r-W8 for emacs-devel@gnu.org; Thu, 11 Dec 2014 07:00:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xz2Pd-0000Iw-9C for emacs-devel@gnu.org; Thu, 11 Dec 2014 07:00:10 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:58886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz2Pd-0000GQ-3E for emacs-devel@gnu.org; Thu, 11 Dec 2014 07:00:05 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xz2Pb-0003Nx-GK for emacs-devel@gnu.org; Thu, 11 Dec 2014 13:00:03 +0100 Original-Received: from 155.55.49.12 ([155.55.49.12]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 11 Dec 2014 13:00:03 +0100 Original-Received: from sb by 155.55.49.12 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 11 Dec 2014 13:00:03 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 13 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 155.55.49.12 Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (windows-nt) Cancel-Lock: sha1:tK9Sz4f6L4wnQ0AGQG2cbtCdRaA= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:179739 Archived-At: >>>>> Steinar Bang : >>>>> esr@snark.thyrsus.com (Eric S. Raymond): >> Rollback is a case in point. It is a command that lets you undo the >> last checkin. Only SCCS and RCS actually support it. Git possibly >> could, in theory, but the Git implementation would be tricky and have >> sharp edges when the last revision had been pushed. > You could allow git rollback for branches that are only local (ie. not a > tracking branch for a remote). Or maybe better: disallow rollback if the current branch is a tracking branch, that is up to date with the remote branch it is tracking.