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: merging emacs-24 Date: Fri, 28 Nov 2014 10:31:11 +0200 Message-ID: <83mw7bn2uo.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417163499 8068 80.91.229.3 (28 Nov 2014 08:31:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Nov 2014 08:31:39 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 28 09:31: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 1XuGxb-0007Jw-RI for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 09:31:27 +0100 Original-Received: from localhost ([::1]:42998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuGxb-0006QM-6Y for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 03:31:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuGxS-0006Q0-VA for emacs-devel@gnu.org; Fri, 28 Nov 2014 03:31:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XuGxN-0004P0-23 for emacs-devel@gnu.org; Fri, 28 Nov 2014 03:31:18 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:43697) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuGxM-0004Os-QT for emacs-devel@gnu.org; Fri, 28 Nov 2014 03:31:12 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NFQ00100Q71LO00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 28 Nov 2014 10:31:11 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFQ001WHQBZL110@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 28 Nov 2014 10:31:11 +0200 (IST) In-reply-to: <87egso5fkh.fsf@lifelogs.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:178401 Archived-At: > From: Ted Zlatanov > Date: Thu, 27 Nov 2014 19:33:50 -0500 > > TZ> [merge "merge-changelog"] > TZ> name = GNU-style ChangeLog merge driver > TZ> driver = /usr/local/bin/git-merge-changelog %O %A %B > > I'm not sure if this means that `git-merge-changelog' doesn't work the > way the Emacs maintainers want, or that I used it incorrectly. Hints > welcome. Most importantly, I need to know if I leave this in my > gitconfig but try to use gitmerge.el, the result will be bad from the > maintainers' perspective. I think you should keep that entry, but you need to examine the results in ChangeLog anyway. git-merge-changelog does try to be smart about where to put merged ChangeLog entries, but it cannot always do a perfect job. AFAICS, gitmerge.el doesn't fix that (maybe it should try), so manual labor is still required.