Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59243
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain oracle.com from 141.146.126.227 cause and error)
Message-ID: <4F75EEC1.5060206@oracle.com>
Date: Fri, 30 Mar 2012 10:34:57 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:11.0) Gecko/20120327 Thunderbird/11.0.1
MIME-Version: 1.0
To: internals@lists.php.net
References: <4F755AFC.2040101@sugarcrm.com> <op.wby2zgoxidpuyk@slws007.slhq.int> <4F756658.3040102@sugarcrm.com>
In-Reply-To: <4F756658.3040102@sugarcrm.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] PHP 5.4.1 RC1 Released
From: christopher.jones@oracle.com (Christopher Jones)



On 3/30/12 12:52 AM, Stas Malyshev wrote:
> Hi!
>
>> I know this is controversial and some people have been committing to both
>> 5.3 and 5.4 NEWS files. However, we have clear guidance for this:
>
> OK, we need to have specific policy on it, because I'm hearing people
> having contradictory opinions on that.

Pre git, I would have strongly voted that when a fix was merged to a
branch then that branch's NEWS file should be updated.  At release
time the NEWS file would be already be complete.  Snapshots would also
be consistent between code & NEWS.

This process differs from the documented one. With the way our git
repo is configured, I don't know if this causes merging issues.

NB the wiki gives git settings for NEWS:

  $ git config merge.NEWS.name "Keep the NEWS file"
  $ git config merge.NEWS.driver 'touch %A'

Chris


-- 
Email: christopher.jones@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/