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: Strange ChangeLog entry after merge from emacs-24 Date: Mon, 08 Dec 2014 12:17:55 -0500 Message-ID: References: <83iohp18fk.fsf@gnu.org> <83bnnfz78y.fsf@gnu.org> <83k322xdzq.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 1418059107 936 80.91.229.3 (8 Dec 2014 17:18:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 8 Dec 2014 17:18:27 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 08 18:18:20 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 1Xy1ww-0005GG-Jr for ged-emacs-devel@m.gmane.org; Mon, 08 Dec 2014 18:18:18 +0100 Original-Received: from localhost ([::1]:35157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xy1ww-0002xT-5x for ged-emacs-devel@m.gmane.org; Mon, 08 Dec 2014 12:18:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58939) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xy1wg-0002v3-Ja for emacs-devel@gnu.org; Mon, 08 Dec 2014 12:18:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xy1wc-0002J4-GP for emacs-devel@gnu.org; Mon, 08 Dec 2014 12:18:02 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xy1wc-0002J0-Dw for emacs-devel@gnu.org; Mon, 08 Dec 2014 12:17:58 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Xy1wa-0001BJ-Ax; Mon, 08 Dec 2014 12:17:56 -0500 X-Spook: broadside Mahmoud Ahmadinejad NWO AK-47 supercomputer X-Ran: f,n#im@R=-S@2X=:%PQi:G9cH?4oCVHsR+CT9Y,&[gj&4t X-Hue: white X-Attribution: GM In-Reply-To: <83k322xdzq.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 08 Dec 2014 19:12:09 +0200") 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:179419 Archived-At: Eli Zaretskii wrote: > So there definitely was some problem in that merge. FWIW, I often used to see that kind of thing with bzrmerge.el. (IIRC I think the changelog-merge plugin did it better.) It's just something the person doing the merge needs to watch out for, or that people need to tidy up afterwards.