On 08/29/2009 05:33 PM, Johannes Schlüter wrote:
Hi,
I thought I sent the warning out on thursday but can't find it in my
internals folder therefore the notice:
We certainly should get 5.3.1 rolling and therefore I'm planning RC1
on Tuesday evening European time
I'm not toooo used to subversion therefore I'd like some comments about
this procedure:
1) Monday evening branch of a release branch owned by me
$ svn cp branches/PHP_5_3 branches/php_5_3_1
Question A: using php as in our tags or PHP as in our branches?
Question B: can svn merge be used to get changes from PHP_5_3 or is a
manual merge better?
2) Tuesday: Change the version
$ vi branches/php_5_3_1/main/php_version.h etc.
3) making the branch a tag
$ svn mv branches/php_5_3_1 tags/php_5_3_1
4) merge the tag into the PHP_5_3 branch
$ cd branches/PHP_5_3&& svn merge ../tags/php_5_3_1
The idea would be that the release appears in the
branch's history and nothing is being lost
Question: Does that make any sense?
5) Change the version to RC2-dev
$ vi branches/PHP_5_3/main/php_version.h etc.
I don't understand why you are merging things back and forth like that.
Just keep it simple:
PHP_5_3 is open for any commits, php_5_3_1 is only for commits you pick
into it. And only do manual merge. Otherwise you won't be merging what
you want for real. ;)
Don't mess with version in PHP_5_3, only in php_5_3_1 where you create
the RCs from. And please, no more tags, those are totally useless in SVN
world, IMO.
--Jani
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
