Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:66453
Return-Path: <derick@php.net>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 48107 invoked from network); 3 Mar 2013 21:02:39 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 3 Mar 2013 21:02:39 -0000
Authentication-Results: pb1.pair.com smtp.mail=derick@php.net; spf=unknown; sender-id=unknown
Authentication-Results: pb1.pair.com header.from=derick@php.net; sender-id=unknown
Received-SPF: unknown (pb1.pair.com: domain php.net does not designate 82.113.146.227 as permitted sender)
X-PHP-List-Original-Sender: derick@php.net
X-Host-Fingerprint: 82.113.146.227 xdebug.org Linux 2.6
Received: from [82.113.146.227] ([82.113.146.227:34281] helo=xdebug.org)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 11/11-41723-D6AB3315 for <internals@lists.php.net>; Sun, 03 Mar 2013 16:02:38 -0500
Received: from localhost (localhost [IPv6:::1])
	by xdebug.org (Postfix) with ESMTPS id DE832DE141;
	Sun,  3 Mar 2013 21:02:33 +0000 (GMT)
Date: Sun, 3 Mar 2013 16:02:32 -0500 (EST)
X-X-Sender: derick@whisky.home.derickrethans.nl
To: Gustavo Lopes <glopes@nebm.ist.utl.pt>
cc: PHP Developers Mailing List <internals@lists.php.net>, 
    David Soria Parra <dsp@php.net>
In-Reply-To: <op.wtdxq2apidpuyk@damnation.nl.lo.geleia.net>
Message-ID: <alpine.DEB.2.02.1303031601170.5184@whisky.home.derickrethans.nl>
References: <alpine.DEB.2.02.1303031359360.5184@whisky.home.derickrethans.nl> <op.wtdxq2apidpuyk@damnation.nl.lo.geleia.net>
User-Agent: Alpine 2.02 (DEB 1266 2009-07-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Subject: Re: [PHP-DEV] NEWS file rename
From: derick@php.net (Derick Rethans)

On Sun, 3 Mar 2013, Gustavo Lopes wrote:

> On Sun, 03 Mar 2013 20:00:47 +0100, Derick Rethans <derick@derickrethans.nl>
> wrote:
> 
> > I've just renamed the NEWS files to a branch specific variant. NEWS 
> > files should not be merged up (as their contents are not linked) and 
> > they always cause a bit pain when doing automated things (such as 
> > the tzdb update).
> 
> How does that fix anything? You'll still have a conflict because 
> you'll be changing a file that doesn't exist in the other branch.

Maybe, but right now it frustrates me every time.

> Besides, the solution is well documented on the wiki:
> 
> https://wiki.php.net/vcs/gitfaq#mandatory_git_settings

Yeah, right. That is not a solution, but a hack. NEWS should just be 
outside of GIT at all as you can not rely on everybody having that hack 
in their config.

cheers,
Derick