Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:66452
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 46734 invoked from network); 3 Mar 2013 21:01:10 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 3 Mar 2013 21:01:10 -0000
Authentication-Results: pb1.pair.com header.from=derick@php.net; sender-id=unknown
Authentication-Results: pb1.pair.com smtp.mail=derick@php.net; spf=unknown; 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:51297] helo=xdebug.org)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id CE/B0-41723-51AB3315 for <internals@lists.php.net>; Sun, 03 Mar 2013 16:01:09 -0500
Received: from localhost (localhost [IPv6:::1])
	by xdebug.org (Postfix) with ESMTPS id D3CFEDE141;
	Sun,  3 Mar 2013 21:01:05 +0000 (GMT)
Date: Sun, 3 Mar 2013 16:01:00 -0500 (EST)
X-X-Sender: derick@whisky.home.derickrethans.nl
To: Stas Malyshev <smalyshev@sugarcrm.com>
cc: PHP Developers Mailing List <internals@lists.php.net>, 
    David Soria Parra <dsp@php.net>
In-Reply-To: <5133ACB2.9050309@sugarcrm.com>
Message-ID: <alpine.DEB.2.02.1303031558580.5184@whisky.home.derickrethans.nl>
References: <alpine.DEB.2.02.1303031359360.5184@whisky.home.derickrethans.nl> <5133ACB2.9050309@sugarcrm.com>
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, Stas Malyshev 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).
> 
> I would really prefer first asking, then doing things to stable repos. 
> And NEWS merging is working just fine in git, what exactly is the 
> problem with that? We have special hooks in place just for that, and I 
> have never seen any problem with them.

Everytime I want to merge up from PHP-5.3 to 5.4 to 5.5 to master for 
the timezone database I get conflicts in NEWS, I don't even touch that 
file.

cheers,
Derick