Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:45052
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.218.206 as permitted sender)
DomainKey-Status: bad
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :cc:content-type:content-transfer-encoding;
        b=wlJyuUpySmUq8XS384hhhcx8lb4w7nM5EXYv165k5JtkMJzLy6W6QOJOiOE2aEvSjp
         /MkSdamPTPxc390Zm2cpABEYHDxduzEJFrpvMpIiOXyaCnjfnMlUt5o8RWhGX0nfg8l1
         bP7ECP8O8Qj7LdlweAzsJK5s9ZKx4Q1kPvkO0=
MIME-Version: 1.0
In-Reply-To: <fe05d1540907200320i60e22da6g852dc4570d2d68f9@mail.gmail.com>
References: <cda548cc0907200109j34d6355dw71aa7d0686125ac5@mail.gmail.com>
	 <fe05d1540907200320i60e22da6g852dc4570d2d68f9@mail.gmail.com>
Date: Mon, 20 Jul 2009 17:41:23 +0200
Message-ID: <cda548cc0907200841l69bbd588g2860f5eca6031521@mail.gmail.com>
To: Pierre Joye <pierre.php@gmail.com>
Cc: group@php.net, PHP Development <internals@lists.php.net>, 
	zoe <zoe.slattery@googlemail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] Tests contributions
From: patrick.allaert@gmail.com (Patrick ALLAERT)

2009/7/20 Pierre Joye <pierre.php@gmail.com>:
> hi,
>
> On Mon, Jul 20, 2009 at 10:09 AM, Patrick
> ALLAERT<patrick.allaert@gmail.com> wrote:
>> Hi lists,
>>
>> Running many "make test" on different platforms (including Solaris and
>> OpenVMS), I'd like to contribute a little bit more than my karma let
>> me do.
>> For now, I have access to php-src/ext/ldap only, however I'd like to
>> backport changes in phpt files that have been done in HEAD and/or
>> PHP_5_3 to PHP_5_2.
>>
>> One example of this is backporting r265951:
>> http://svn.php.net/viewvc?view=revision&revision=265951
>>
>> Would you agree granting me access to */tests so that I can improve
>> testability of PHP_5_2?
>
> Done (and NEWS too). Also try to commit the tests in all branches at
> the same time, see http://news.php.net/php.internals/44993 for a
> detailed explanation :)

Thanks Pierre,

Concerning Rasmus' method, I agree, but partially.

Merge shouldn't be done with something else than "svn merge" or a
frontend to it, SVN having merge tracking since v1.5 we shoudn't use
plain diff/patch when the operation could be done 100% natively. Ok
otherwise.

MFH/MFB should be avoided and native tracking through svn:mergeinfo
should be promoted. Mixing the two will lead to not taking the benefit
of SVN against CVS IMHO.

My best practices:
1) commit to HEAD.
2) "svn merge" for every supported branches.
3) one single commit for all the branches as Rasmus explained.

Doesn't need any fancy tool or frontend, 100% native and tracking included.

To be validated by RM's maybe ? :-)

Patrick