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 18:12:29 +0100 Organization: Probably a good idea Message-ID: <87sigmrtz6.fsf@dod.no> References: <20141211092138.6D5F6C008E@snark.thyrsus.com> <874mt2iksu.fsf@fencepost.gnu.org> <87fvcm8jf0.fsf@zigzag.favinet> <20141211125145.GB25499@thyrsus.com> <83d27qtar6.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418318000 18246 80.91.229.3 (11 Dec 2014 17:13:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 11 Dec 2014 17:13:20 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 11 18:13:13 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 1Xz7Ie-0004Va-Kn for ged-emacs-devel@m.gmane.org; Thu, 11 Dec 2014 18:13:12 +0100 Original-Received: from localhost ([::1]:52703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz7Ie-0001Lf-5E for ged-emacs-devel@m.gmane.org; Thu, 11 Dec 2014 12:13:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz7IL-0001LM-ED for emacs-devel@gnu.org; Thu, 11 Dec 2014 12:12:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xz7IE-0005AP-2O for emacs-devel@gnu.org; Thu, 11 Dec 2014 12:12:53 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:53699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz7ID-00059d-TE for emacs-devel@gnu.org; Thu, 11 Dec 2014 12:12:46 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xz7IC-00046k-Gk for emacs-devel@gnu.org; Thu, 11 Dec 2014 18:12:44 +0100 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 11 Dec 2014 18:12:44 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 11 Dec 2014 18:12:44 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 14 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.4 (gnu/linux) Cancel-Lock: sha1:sqcCxJDd/rb9I2z2YEqx71/3WR4= 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:179800 Archived-At: >>>>> Eli Zaretskii : > ??? It's known as "reverse cherry-picking", and is AFAIK possible in > Git, bzr, and hg. Do you mean yank a commit from somewhere back in history, keeping the newer one? It would be possible from command line git, I guess... changing the sha1 hash of all commits following the yanked commit. But I would use "git revert" for something like this instead, adding a commit, rather than removing one, and keeping all of the existing commits' sha1 values.