Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66451 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 40586 invoked from network); 3 Mar 2013 20:04:07 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 3 Mar 2013 20:04:07 -0000 Authentication-Results: pb1.pair.com header.from=smalyshev@sugarcrm.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=smalyshev@sugarcrm.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain sugarcrm.com designates 173.203.6.155 as permitted sender) X-PHP-List-Original-Sender: smalyshev@sugarcrm.com X-Host-Fingerprint: 173.203.6.155 smtp155.ord.emailsrvr.com Linux 2.6 Received: from [173.203.6.155] ([173.203.6.155:52087] helo=smtp155.ord.emailsrvr.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 10/D8-20272-6BCA3315 for ; Sun, 03 Mar 2013 15:04:06 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp20.relay.ord1a.emailsrvr.com (SMTP Server) with ESMTP id D94F31C018F; Sun, 3 Mar 2013 15:04:03 -0500 (EST) X-Virus-Scanned: OK Received: by smtp20.relay.ord1a.emailsrvr.com (Authenticated sender: smalyshev-AT-sugarcrm.com) with ESMTPSA id 6F2591C018D; Sun, 3 Mar 2013 15:04:03 -0500 (EST) Message-ID: <5133ACB2.9050309@sugarcrm.com> Date: Sun, 03 Mar 2013 12:04:02 -0800 Organization: SugarCRM User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:17.0) Gecko/20130216 Thunderbird/17.0.3 MIME-Version: 1.0 To: Derick Rethans CC: PHP Developers Mailing List , David Soria Parra References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] NEWS file rename From: smalyshev@sugarcrm.com (Stas Malyshev) Hi! > 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. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227