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: changelog-merge plugin and edited ChangeLog entries Date: Sun, 27 Feb 2011 05:57:50 +0200 Message-ID: <83mxlinn7l.fsf@gnu.org> References: <83fwrbp6gn.fsf@gnu.org> <87aahji3qm.fsf@catnip.gol.com> <87k4gmh0ix.fsf@catnip.gol.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1298779080 30097 80.91.229.12 (27 Feb 2011 03:58:00 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 27 Feb 2011 03:58:00 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 27 04:57:55 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 1PtXla-0007Pb-TA for ged-emacs-devel@m.gmane.org; Sun, 27 Feb 2011 04:57:55 +0100 Original-Received: from localhost ([127.0.0.1]:43989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtXla-000153-9S for ged-emacs-devel@m.gmane.org; Sat, 26 Feb 2011 22:57:54 -0500 Original-Received: from [140.186.70.92] (port=40651 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtXlU-000145-Bh for emacs-devel@gnu.org; Sat, 26 Feb 2011 22:57:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PtXlT-0007ug-5H for emacs-devel@gnu.org; Sat, 26 Feb 2011 22:57:48 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:44576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PtXlS-0007uW-VF; Sat, 26 Feb 2011 22:57:47 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0LH900E00C2HUM00@a-mtaout20.012.net.il>; Sun, 27 Feb 2011 05:57:45 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.124.53.157]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LH900EIVCC8GI70@a-mtaout20.012.net.il>; Sun, 27 Feb 2011 05:57:45 +0200 (IST) In-reply-to: <87k4gmh0ix.fsf@catnip.gol.com> 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:136569 Archived-At: > From: Miles Bader > Cc: Eli Zaretskii , emacs-devel@gnu.org > Date: Sun, 27 Feb 2011 07:52:06 +0900 > > 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. Yea, yea, and git is better than bzr, and we should destroy Carthage...