Hi,
thanks for your suggestions, some comments below:
On Mon, 2009-08-31 at 14:09 +0200, Patrick ALLAERT wrote:
> > 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
>
> I would suggest a copy rather than a move because you may have to
> create different tags (RC1, RC2,...) from this branch.
good point.
> $ svn copy branches/PHP_5_3_1 tags/php_5_3_1RC1
>
> > 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
>
> There is no such merge needed, svn keeps track of copies and merges.
> From svn clients, it is perfectly possible to generate a graph with
> copies (tags) made from that branch.
The point is: diffing against the tags/ directory gives a way longer
diff command than diffing against an older revision of the same file ...
while svn is missing the "knowledge" about branches/tags ... that's the
thing where I really like CVS more than svn:
cvs diff -r SOME_TAG file.c
with svn that's either typing the full URL or tons of "../". And the
idea now was to simplify such a diff.
johannes
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
