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: changelog-merge plugin and edited ChangeLog entries Date: Sat, 26 Feb 2011 14:53:25 -0500 Message-ID: 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 1298750023 8078 80.91.229.12 (26 Feb 2011 19:53:43 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 26 Feb 2011 19:53:43 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Feb 26 20:53:39 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 1PtQCu-0000yp-Vy for ged-emacs-devel@m.gmane.org; Sat, 26 Feb 2011 20:53:37 +0100 Original-Received: from localhost ([127.0.0.1]:53380 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtQCu-0005mU-Kw for ged-emacs-devel@m.gmane.org; Sat, 26 Feb 2011 14:53:36 -0500 Original-Received: from [140.186.70.92] (port=39017 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtQCp-0005lA-9F for emacs-devel@gnu.org; Sat, 26 Feb 2011 14:53:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PtQCn-0003Jz-5v for emacs-devel@gnu.org; Sat, 26 Feb 2011 14:53:30 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:22516 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PtQCm-0003Jc-4G; Sat, 26 Feb 2011 14:53:28 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAH3oaE1FpZIs/2dsb2JhbACmRXW7GIVhBIUQj18 X-IronPort-AV: E=Sophos;i="4.62,232,1297054800"; d="scan'208";a="93668457" Original-Received: from 69-165-146-44.dsl.teksavvy.com (HELO ceviche.home) ([69.165.146.44]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 26 Feb 2011 14:53:26 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id ECF54660D6; Sat, 26 Feb 2011 14:53:25 -0500 (EST) In-Reply-To: <87aahji3qm.fsf@catnip.gol.com> (Miles Bader's message of "Sat, 26 Feb 2011 17:45:05 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.183 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:136561 Archived-At: > 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. Stefan