From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Wed, 26 Nov 2014 22:48:12 -0500 Message-ID: <61sih5uww3.fsf@fencepost.gnu.org> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es> <87oart74q5.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1417060115 17381 80.91.229.3 (27 Nov 2014 03:48:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 03:48:35 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 04:48:29 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 1Xtq4C-0004vy-3O for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 04:48:28 +0100 Original-Received: from localhost ([::1]:36923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtq4B-0005D7-Mg for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2014 22:48:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtq3y-0005Cq-0S for emacs-devel@gnu.org; Wed, 26 Nov 2014 22:48:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xtq3x-0001r3-8a for emacs-devel@gnu.org; Wed, 26 Nov 2014 22:48:13 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47488) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtq3x-0001qs-5G for emacs-devel@gnu.org; Wed, 26 Nov 2014 22:48:13 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Xtq3w-00089A-OJ; Wed, 26 Nov 2014 22:48:12 -0500 X-Spook: LABLINK radar Blowfish anarchy IRA Serbian ANC White House X-Ran: "w.Lwn4F0e;40@1?T'jXY5$s~GL'95*\k@6:@])V,BW4o<|W\?ob'Sr8)V$R4mfx=7p><) X-Hue: green X-Attribution: GM User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:178343 Archived-At: Thanks for trying. The ChangeLogs don't look right. All merged new entries should have gone to the top (this was trivial with bzr's changelog-merge plugin, probably git has something similar) and got today's date. Also, the ChangeLogs for the changes marked "backport" (etc, check for any commit that matches bzrmerge-skip-regexp) have all been merged back to trunk, leading to duplicate entries. The new ones should all be removed. This is part of what bzrmerge.el handled. BTW: with bzr, the logs for the merged changes would be visible with bzr log -n0 How does one do that with git log?