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: splitting ChangeLogs Date: Wed, 06 Apr 2011 21:08:08 +0300 Message-ID: <838vvnuubb.fsf@gnu.org> References: <83k4f8uls8.fsf@gnu.org> <83hbabv1ol.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1302113578 10391 80.91.229.12 (6 Apr 2011 18:12:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 6 Apr 2011 18:12:58 +0000 (UTC) Cc: emacs-devel@gnu.org, lekktu@gmail.com To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 06 20:12:54 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Q7XDo-00076i-6X for ged-emacs-devel@m.gmane.org; Wed, 06 Apr 2011 20:12:52 +0200 Original-Received: from localhost ([127.0.0.1]:55424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q7XDn-000631-DU for ged-emacs-devel@m.gmane.org; Wed, 06 Apr 2011 14:12:51 -0400 Original-Received: from [140.186.70.92] (port=46500 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q7XBH-0004dI-CC for emacs-devel@gnu.org; Wed, 06 Apr 2011 14:10:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q7XBG-00013j-3i for emacs-devel@gnu.org; Wed, 06 Apr 2011 14:10:15 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:40154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q7XBF-00013a-TM; Wed, 06 Apr 2011 14:10:14 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0LJ800500T2QZO00@a-mtaout20.012.net.il>; Wed, 06 Apr 2011 21:10:13 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.126.47.180]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LJ800536T4Y4MF0@a-mtaout20.012.net.il>; Wed, 06 Apr 2011 21:10:12 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.166 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:138261 Archived-At: > From: Stefan Monnier > Cc: rgm@gnu.org, lekktu@gmail.com, emacs-devel@gnu.org > Date: Wed, 06 Apr 2011 12:53:21 -0400 > > > What conflicts? there are no conflicts (assuming you have the > > changelog_merge plugin). > > Well, in my view, the changelog_merge plugin resolves conflicts > resulting from a merge more than it performs a merge, but I don't know > if the implementation matches my mental image of it. It doesn't. changelog_merge completely replaces the default merge method. In fact, it falls back on the default method if its own fails.