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: Should we restore manually maintained ChangeLogs Date: Thu, 10 Mar 2016 08:49:51 +0200 Message-ID: <83mvq6n7xs.fsf@gnu.org> References: <83lh5utbxb.fsf@gnu.org> <56DDD02A.20809@cs.ucla.edu> <83fuw2t2ue.fsf@gnu.org> <56DE0F6A.6010207@cs.ucla.edu> <83pov5rmt6.fsf@gnu.org> <56DFD78F.40205@cs.ucla.edu> <56E06093.7050509@cs.ucla.edu> <83twkfo7ij.fsf@gnu.org> <20160309181005.GF3948@acm.fritz.box> <87vb4vuu59.fsf@thinkpad.rath.org> <87pov3nrnm.fsf@linux-m68k.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1457592607 5628 80.91.229.3 (10 Mar 2016 06:50:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 10 Mar 2016 06:50:07 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 10 07:49:59 2016 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 1aduQ0-0000Xx-UK for ged-emacs-devel@m.gmane.org; Thu, 10 Mar 2016 07:49:57 +0100 Original-Received: from localhost ([::1]:46593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aduQ0-0003b7-Ed for ged-emacs-devel@m.gmane.org; Thu, 10 Mar 2016 01:49:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aduPn-0003ad-1K for emacs-devel@gnu.org; Thu, 10 Mar 2016 01:49:43 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aduPj-000072-0V for emacs-devel@gnu.org; Thu, 10 Mar 2016 01:49:42 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35279) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aduPi-00006y-Ti; Thu, 10 Mar 2016 01:49:38 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4848 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aduPi-0000nW-2o; Thu, 10 Mar 2016 01:49:38 -0500 In-reply-to: <87pov3nrnm.fsf@linux-m68k.org> (message from Andreas Schwab on Thu, 10 Mar 2016 00:43:57 +0100) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:201352 Archived-At: > From: Andreas Schwab > Date: Thu, 10 Mar 2016 00:43:57 +0100 > > > Mercurial with the "evolve" extension implements non-destructive history > > editing. In short, commits can have metadata that marks them as > > "superseding" a previous commit. Both superseded and new commit remain > > part of the repository, but most commands be default work on the > > superseding commit. > > Like git replace. Do you know how does "git replace" interact with merging, rebasing, and cherry-picking? The man page doesn't seem to mention these.