Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:57092 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 91854 invoked from network); 24 Dec 2011 20:44:08 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 24 Dec 2011 20:44:08 -0000 Authentication-Results: pb1.pair.com smtp.mail=smalyshev@sugarcrm.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=smalyshev@sugarcrm.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain sugarcrm.com designates 67.192.241.113 as permitted sender) X-PHP-List-Original-Sender: smalyshev@sugarcrm.com X-Host-Fingerprint: 67.192.241.113 smtp113.dfw.emailsrvr.com Linux 2.6 Received: from [67.192.241.113] ([67.192.241.113:49244] helo=smtp113.dfw.emailsrvr.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 0A/BF-16446-69936FE4 for ; Sat, 24 Dec 2011 15:44:07 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp21.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id A749B2402D9; Sat, 24 Dec 2011 15:44:03 -0500 (EST) X-Virus-Scanned: OK Received: by smtp21.relay.dfw1a.emailsrvr.com (Authenticated sender: smalyshev-AT-sugarcrm.com) with ESMTPSA id 2156E2402D8; Sat, 24 Dec 2011 15:44:03 -0500 (EST) Message-ID: <4EF63992.1070205@sugarcrm.com> Date: Sat, 24 Dec 2011 12:44:02 -0800 Organization: SugarCRM User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:8.0) Gecko/20111105 Thunderbird/8.0 MIME-Version: 1.0 To: =?UTF-8?B?Sm9oYW5uZXMgU2NobMO8dGVy?= CC: Derick Rethans , Laruence , Pierre Joye , Rafael Kassner , PHP Internals References: <1324733675.9809.1.camel@guybrush> In-Reply-To: <1324733675.9809.1.camel@guybrush> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] [Proposal] Remove the tail ws in codes From: smalyshev@sugarcrm.com (Stas Malyshev) Hi! > It's not only bad for merges, also confusing with blame/annotate while > identifying the reason for bug. As soon as we move to git, IIRC git has ability to separate ws-changes from non-ws ones and do diffs/history while ignoring ws. I didn't figure out if you can do non-ws merge (I suspect you can since you can do non-ws diff manually and then apply it). So I'd suggest at least waiting till we get git running. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227