From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Removing rollback from VC mode - request for comment Date: Thu, 11 Dec 2014 20:16:07 +0200 Message-ID: <83vblirr14.fsf@gnu.org> References: <20141211092138.6D5F6C008E@snark.thyrsus.com> <874mt2iksu.fsf@fencepost.gnu.org> <87fvcm8jf0.fsf@zigzag.favinet> <20141211125145.GB25499@thyrsus.com> <83d27qtar6.fsf@gnu.org> <87sigmrtz6.fsf@dod.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1418321804 20776 80.91.229.3 (11 Dec 2014 18:16:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 11 Dec 2014 18:16:44 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 11 19:16:36 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 1Xz8Hz-0000mI-KA for ged-emacs-devel@m.gmane.org; Thu, 11 Dec 2014 19:16:35 +0100 Original-Received: from localhost ([::1]:52954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz8Hy-0007Cu-Qh for ged-emacs-devel@m.gmane.org; Thu, 11 Dec 2014 13:16:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz8He-0007C4-7B for emacs-devel@gnu.org; Thu, 11 Dec 2014 13:16:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xz8HY-0002f1-SN for emacs-devel@gnu.org; Thu, 11 Dec 2014 13:16:14 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:39602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz8HY-0002eW-L7 for emacs-devel@gnu.org; Thu, 11 Dec 2014 13:16:08 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NGF00400JRVKI00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Thu, 11 Dec 2014 20:16:07 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NGF004OMK2V5870@a-mtaout20.012.net.il>; Thu, 11 Dec 2014 20:16:07 +0200 (IST) In-reply-to: <87sigmrtz6.fsf@dod.no> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:179810 Archived-At: > From: Steinar Bang > Date: Thu, 11 Dec 2014 18:12:29 +0100 > > >>>>> 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? You don't yank it -- history is immutable -- you undo it by another 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. That's the mechanics. From the human's POV, the commit was "removed".