From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: changelog-merge plugin and edited ChangeLog entries Date: Sun, 27 Feb 2011 07:52:06 +0900 Message-ID: <87k4gmh0ix.fsf@catnip.gol.com> References: <83fwrbp6gn.fsf@gnu.org> <87aahji3qm.fsf@catnip.gol.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1298760747 24782 80.91.229.12 (26 Feb 2011 22:52:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 26 Feb 2011 22:52:27 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Feb 26 23:52:23 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 1PtSzq-0005HP-5l for ged-emacs-devel@m.gmane.org; Sat, 26 Feb 2011 23:52:18 +0100 Original-Received: from localhost ([127.0.0.1]:38520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtSzp-0000Tt-NR for ged-emacs-devel@m.gmane.org; Sat, 26 Feb 2011 17:52:17 -0500 Original-Received: from [140.186.70.92] (port=54961 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtSzl-0000SW-HY for emacs-devel@gnu.org; Sat, 26 Feb 2011 17:52:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PtSzk-0003gF-Dt for emacs-devel@gnu.org; Sat, 26 Feb 2011 17:52:13 -0500 Original-Received: from smtp12.dentaku.gol.com ([203.216.5.74]:34423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PtSzi-0003fU-Qz; Sat, 26 Feb 2011 17:52:11 -0500 Original-Received: from 218.231.234.87.eo.eaccess.ne.jp ([218.231.234.87] helo=catnip.gol.com) by smtp12.dentaku.gol.com with esmtpa (Dentaku) (envelope-from ) id 1PtSzf-0002QF-RT; Sun, 27 Feb 2011 07:52:07 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id 5899BDFA0; Sun, 27 Feb 2011 07:52:06 +0900 (JST) System-Type: x86_64-unknown-linux-gnu In-Reply-To: (Stefan Monnier's message of "Sat, 26 Feb 2011 14:53:25 -0500") Original-Lines: 17 X-Virus-Scanned: ClamAV GOL (outbound) X-Abuse-Complaints: abuse@gol.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 203.216.5.74 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:136567 Archived-At: Stefan Monnier writes: >> The gnulib "git-merge-changelog" merge program[*] is reported to >> handle this case correctly, and supposedly can be used with either git >> or bzr (or hg). > > I haven't had too many problems related to this with change-log-mode's > change-log-resolve-conflict either. The nice thing about git-merge-changelog though is that it will handle automatically for bulk merges (though apparently not for bzr), without the user needing to get involved at all. -Miles -- XML is like violence. If it doesn't solve your problem, you're not using enough of it.