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 14:07:27 +0900 Message-ID: <87hbbqdq0g.fsf@catnip.gol.com> References: <83fwrbp6gn.fsf@gnu.org> <87aahji3qm.fsf@catnip.gol.com> <87k4gmh0ix.fsf@catnip.gol.com> <83mxlinn7l.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1298784554 16634 80.91.229.12 (27 Feb 2011 05:29:14 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 27 Feb 2011 05:29:14 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 27 06:29:08 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 1PtZBq-0005UP-1K for ged-emacs-devel@m.gmane.org; Sun, 27 Feb 2011 06:29:06 +0100 Original-Received: from localhost ([127.0.0.1]:37041 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtYrV-0005ML-KE for ged-emacs-devel@m.gmane.org; Sun, 27 Feb 2011 00:08:05 -0500 Original-Received: from [140.186.70.92] (port=44411 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtYrD-0005D6-P9 for emacs-devel@gnu.org; Sun, 27 Feb 2011 00:08:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PtYr4-0007Ua-2v for emacs-devel@gnu.org; Sun, 27 Feb 2011 00:07:42 -0500 Original-Received: from smtp12.dentaku.gol.com ([203.216.5.74]:40905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PtYqx-0007Td-30; Sun, 27 Feb 2011 00:07:31 -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 1PtYqt-0003Pb-WF; Sun, 27 Feb 2011 14:07:28 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id 1E164DFA0; Sun, 27 Feb 2011 14:07:27 +0900 (JST) System-Type: x86_64-unknown-linux-gnu In-Reply-To: <83mxlinn7l.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 27 Feb 2011 05:57:50 +0200") Original-Lines: 18 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:136573 Archived-At: Eli Zaretskii writes: >> > 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. > > Yea, yea, and git is better than bzr, and we should destroy > Carthage... Huh? I wasn't trying to be snide... -miles -- History, n. An account mostly false, of events mostly unimportant, which are brought about by rulers mostly knaves, and soldiers mostly fools.