From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Should we restore manually maintained ChangeLogs Date: Thu, 10 Mar 2016 10:05:06 +0100 Message-ID: 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> <83mvq6n7xs.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1457600765 32190 80.91.229.3 (10 Mar 2016 09:06:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 10 Mar 2016 09:06:05 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 10 10:05:56 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 1adwXU-0005xS-56 for ged-emacs-devel@m.gmane.org; Thu, 10 Mar 2016 10:05:48 +0100 Original-Received: from localhost ([::1]:47082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adwXT-0007DZ-JN for ged-emacs-devel@m.gmane.org; Thu, 10 Mar 2016 04:05:47 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adwX5-0007DU-QI for emacs-devel@gnu.org; Thu, 10 Mar 2016 04:05:27 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adwX0-0001o8-7k for emacs-devel@gnu.org; Thu, 10 Mar 2016 04:05:23 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:37094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adwWw-0001ne-AN; Thu, 10 Mar 2016 04:05:14 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3qLPVw6rMZz3hjTB; Thu, 10 Mar 2016 10:05:12 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3qLPVw4tJSzvhQS; Thu, 10 Mar 2016 10:05:12 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id w18TL3ElicgG; Thu, 10 Mar 2016 10:05:07 +0100 (CET) X-Auth-Info: 8JMbDfTMOeXN1sigjutO7vtj3Ovc7l0OkU7M39ljfMBX+G0ogfgHOkBSAI6HcGH4 Original-Received: from hawking.suse.de (nat.nue.novell.com [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Thu, 10 Mar 2016 10:05:07 +0100 (CET) X-Yow: .. I think I'll KILL myself by leaping out of this 14th STORY WINDOW while reading ERICA JONG'S poetry!! In-Reply-To: <83mvq6n7xs.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 10 Mar 2016 08:49:51 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 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:201358 Archived-At: Eli Zaretskii writes: >> 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. git replace should be transparent most of the time (except for some plumbing like git cat-file, and you can ignore replacements with --no-replace-objects). But note that they are stored in a different namespace that is not pulled by default. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."