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: Fri, 28 Nov 2014 09:29:38 -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> <87egso5fkh.fsf@lifelogs.com> <83mw7bn2uo.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417185036 461 80.91.229.3 (28 Nov 2014 14:30:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Nov 2014 14:30:36 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 28 15:30: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 1XuMZ2-0004Nx-2W for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 15:30:28 +0100 Original-Received: from localhost ([::1]:44666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuMZ1-0004qn-B6 for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 09:30:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuMYR-0004gq-Kp for emacs-devel@gnu.org; Fri, 28 Nov 2014 09:29:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XuMYF-0002SW-Fo for emacs-devel@gnu.org; Fri, 28 Nov 2014 09:29:51 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:44452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuMYF-0002SQ-BC; Fri, 28 Nov 2014 09:29:39 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id sASETcIC004676; Fri, 28 Nov 2014 09:29:38 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 52D77670B; Fri, 28 Nov 2014 09:29:38 -0500 (EST) In-Reply-To: <83mw7bn2uo.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 28 Nov 2014 10:31:11 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5139=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5139> : inlines <1568> : streams <1350042> : uri <1836481> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 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:178418 Archived-At: > perfect job. AFAICS, gitmerge.el doesn't fix that (maybe it should > try), so manual labor is still required. I haven't checked gitmerge.el, but bzrmerge.el had special code to do the ChangeLog merge, and at some point at least it did it better (or at least, more closely to our conventions) than Bzr's "changelog-merge" plugin. Stefan