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: Abolishing ChangeLog files Date: Fri, 29 Mar 2013 12:16:48 +0300 Message-ID: <83ehey5zwf.fsf@gnu.org> References: <87y5d9p5td.fsf@dex.adm.naquadah.org> <87vc8dtbcb.fsf@lifelogs.com> <871ub1gmdf.fsf@engster.org> <87d2ulovd0.fsf@dex.adm.naquadah.org> <85r4j0h1ww.fsf@member.fsf.org> <85li98h1qx.fsf@member.fsf.org> <87ehf0b3x2.fsf@uwakimon.sk.tsukuba.ac.jp> <87obe3gaem.fsf@engster.org> <87ip4bj1ay.fsf_-_@earth.home> <87a9pnhjya.fsf@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1364548630 25288 80.91.229.3 (29 Mar 2013 09:17:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 Mar 2013 09:17:10 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steve Youngs Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 29 10:17:37 2013 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 1ULVRJ-0000Mx-0d for ged-emacs-devel@m.gmane.org; Fri, 29 Mar 2013 10:17:37 +0100 Original-Received: from localhost ([::1]:36302 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULVQu-00058l-Ej for ged-emacs-devel@m.gmane.org; Fri, 29 Mar 2013 05:17:12 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:35086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULVQr-00058e-4F for emacs-devel@gnu.org; Fri, 29 Mar 2013 05:17:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULVQo-0000hq-GR for emacs-devel@gnu.org; Fri, 29 Mar 2013 05:17:09 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:39621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULVQo-0000he-8A for emacs-devel@gnu.org; Fri, 29 Mar 2013 05:17:06 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MKF003000952600@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Fri, 29 Mar 2013 12:16:28 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MKF0029W0FFSJ60@a-mtaout22.012.net.il>; Fri, 29 Mar 2013 12:16:27 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:158413 Archived-At: > From: Steve Youngs > Date: Fri, 29 Mar 2013 18:02:40 +1000 > Keywords: method,information,problem,place,logging > > Your method does nothing to alleviate the problem of recurring conflicts > on the ChangeLog files. These conflicts only happen if changes are applied manually with 'patch' or similar. When merging between branches, bzr handles ChangeLog files specially, and avoids conflicts caused by addition of entries.