From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Sat, 29 Nov 2014 15:02:26 -0500 Message-ID: References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es> <87oart74q5.fsf@lifelogs.com> <61sih5uww3.fsf@fencepost.gnu.org> <878uiw7q5n.fsf@lifelogs.com> <87egso5fkh.fsf@lifelogs.com> <83mw7bn2uo.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1417291360 6685 80.91.229.3 (29 Nov 2014 20:02:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Nov 2014 20:02:40 +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 Nov 29 21:02:33 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XuoDw-0002fW-DM for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 21:02:32 +0100 Original-Received: from localhost ([::1]:48703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuoDw-0005Eq-2W for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 15:02:32 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuoDr-0005EY-SZ for emacs-devel@gnu.org; Sat, 29 Nov 2014 15:02:28 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XuoDr-0006XB-3W for emacs-devel@gnu.org; Sat, 29 Nov 2014 15:02:27 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46123) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuoDr-0006X2-0d for emacs-devel@gnu.org; Sat, 29 Nov 2014 15:02:27 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XuoDq-00023C-ID; Sat, 29 Nov 2014 15:02:26 -0500 X-Spook: data haven USCODE diwn Albania 2600 Magazine chameleon X-Ran: :Wi~y]$_D|!M]%5xciH&VI(K+*zg~m%b957%}HVR=m3qCFG0WB_]tcy.qQR7$>f,q.t0p6 X-Hue: red X-Attribution: GM User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178482 Archived-At: Stefan Monnier wrote: > I haven't checked gitmerge.el, but bzrmerge.el had special code to do > the ChangeLog merge, and at some point at least it did it better (or at > least, more closely to our conventions) than Bzr's > "changelog-merge" plugin. I think I disagree. IIRC, bzrmerge used to look for ChangeLog conflicts, move those entries to the top and redate them. I found that this did not work well for me in practice. I found it better to use the changelog-merge plugin, which moved new merged entried to the top, then re-date things by hand.