From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "John Wiegley" Newsgroups: gmane.emacs.devel Subject: Re: Abolishing ChangeLog files Date: Fri, 29 Mar 2013 14:20:12 +0000 Organization: New Artisans LLC Message-ID: 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1364567473 8848 80.91.229.3 (29 Mar 2013 14:31:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 Mar 2013 14:31:13 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 29 15:31:40 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 1ULaL7-0005p3-Jy for ged-emacs-devel@m.gmane.org; Fri, 29 Mar 2013 15:31:33 +0100 Original-Received: from localhost ([::1]:42278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULaKj-0007AS-ER for ged-emacs-devel@m.gmane.org; Fri, 29 Mar 2013 10:31:09 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:49820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULaKf-0007A2-Kz for emacs-devel@gnu.org; Fri, 29 Mar 2013 10:31:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULaAD-0005wN-AX for emacs-devel@gnu.org; Fri, 29 Mar 2013 10:20:39 -0400 Original-Received: from mail-ve0-f178.google.com ([209.85.128.178]:33234) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULaAD-0005w6-3k for emacs-devel@gnu.org; Fri, 29 Mar 2013 10:20:17 -0400 Original-Received: by mail-ve0-f178.google.com with SMTP id db10so574634veb.37 for ; Fri, 29 Mar 2013 07:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:organization:references :mail-followup-to:date:in-reply-to:message-id:user-agent :mime-version:content-type; bh=L50SwiEjUqJIlXs4+4faQMd8Sn6CbqW59ITvr36v9s0=; b=IaBz2j1j/uT7sjvRnY/vN6Qyp679Vkc58zDFaySip/Uyh/HY/3g4s34vtyJ5fij+O9 2nEXEsiiJLmyw/ll+lMoI9cjgGnYVHpoGmw/cbsaVRwue46mo3svBsRh8i9DMUqHEtja r2v8JRH2eFlxihH9MO3Al26WUwkOnrPWRDwcMdJK85ltTi9lcjR5YoFYQMMaOnhzyLPk MyZYeRfklSRwR9Zd9Yrm/ugYztK3b8K/Jk42bEc66kIKmIXucBC3FXxarRTNOnY39+2r bZvsfv0JvcFn1+OcV2sHgcdWHAc0TnStUTONtlDxrgzFbfaxqyEHzbi9aJMq+Ps2kbWw v7Sw== X-Received: by 10.52.37.81 with SMTP id w17mr1607574vdj.70.1364566816117; Fri, 29 Mar 2013 07:20:16 -0700 (PDT) Original-Received: from Hermes.local (cpc11-mort5-2-0-cust73.19-2.cable.virginmedia.com. [80.235.133.74]) by mx.google.com with ESMTPS id tp10sm3478452vec.1.2013.03.29.07.20.14 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 29 Mar 2013 07:20:15 -0700 (PDT) Original-Received: by Hermes.local (Postfix, from userid 501) id 7B0179D0D0C; Fri, 29 Mar 2013 14:20:12 +0000 (GMT) Mail-Followup-To: emacs-devel@gnu.org In-Reply-To: (Steve Youngs's message of "Fri, 29 Mar 2013 18:02:40 +1000") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3 (darwin) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.128.178 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:158425 Archived-At: >>>>> Steve Youngs writes: > Your method does nothing to alleviate the problem of recurring conflicts on > the ChangeLog files. Because of their very nature and purpose the ChangeLog > files get the most conflicts. Normally very easy to resolve, but still, a > PITA. Steve, Git does support "drivers" for its merge algorithm, for specialized data types that might otherwise be prone to constant conflicts. See: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c John