From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 12:17:27 -0500 Message-ID: References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es> <87oart74q5.fsf@lifelogs.com> <61sih5uww3.fsf@fencepost.gnu.org> <878uiw7q5n.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417108709 9720 80.91.229.3 (27 Nov 2014 17:18:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 17:18:29 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 18:18:22 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 1Xu2hx-000456-Cz for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 18:18:21 +0100 Original-Received: from localhost ([::1]:40880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2hw-0004s7-Tw for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 12:18:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2hc-0004rK-8A for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:18:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu2hT-0007GU-Tf for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:18:00 -0500 Original-Received: from mercure.iro.umontreal.ca ([132.204.24.67]:54149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2hT-0007GM-Py for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:17:51 -0500 Original-Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 3FB3985059; Thu, 27 Nov 2014 12:17:51 -0500 (EST) Original-Received: from lechon.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id C352F1E5B8A; Thu, 27 Nov 2014 12:17:27 -0500 (EST) Original-Received: by lechon.iro.umontreal.ca (Postfix, from userid 20848) id 6C87AB4085; Thu, 27 Nov 2014 12:17:27 -0500 (EST) In-Reply-To: <878uiw7q5n.fsf@lifelogs.com> (Ted Zlatanov's message of "Thu, 27 Nov 2014 08:02:12 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82, MC_TSTLAST 0.00) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 132.204.24.67 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:178368 Archived-At: GM> Also, the ChangeLogs for the changes marked "backport" (etc, check for GM> any commit that matches bzrmerge-skip-regexp) have all been merged back GM> to trunk, leading to duplicate entries. The new ones should all be GM> removed. This is part of what bzrmerge.el handled. > I don't think Git merges can work that way, though. Glenn is talking about the content of the ChangeLog files. To Git (just as Bzr before) they're just files, not metadata, so of course you can add/remove any entry you feel like. Stefan