Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:45442
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.218.226 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=SKdFWOw0S9qJyNOGHDiT9TwsvpXb39LbcUw4QB+Kqd28rzVrSWvIQHRrFErXb8IOiE
         of8tIdob5OSpEJzDe072MUsSSEbmb1+vhgOrm+H5fXaSwGEIK2zdzQ6ydIVI2jOv37bS
         yr+0uJCyR+HCsxvtg+ymJdkT+nHx6B29Ii7j4=
MIME-Version: 1.0
In-Reply-To: <1251556428.22693.20.camel@guybrush>
References: <1251556428.22693.20.camel@guybrush>
Date: Mon, 31 Aug 2009 14:09:16 +0200
Message-ID: <cda548cc0908310509x524f47d3h8b77971d9e4f1757@mail.gmail.com>
To: =?UTF-8?Q?Johannes_Schl=C3=BCter?= <johannes@php.net>
Cc: internals@lists.php.net
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [PHP-DEV] Really going to 5.3.1RC1
From: patrick.allaert@gmail.com (Patrick ALLAERT)

Hi Johannes,

2009/8/29 Johannes Schl=C3=BCter <johannes@php.net>:

[snip]

> 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
> =C2=A0 $ svn cp branches/PHP_5_3 branches/php_5_3_1
> =C2=A0 Question A: using php as in our tags or PHP as in our branches?

I would suggest keeping "PHP" for a branch because it will be used as
is, it can be renamed with "php" while doing the svn copy|move to
tags. More details after.

> =C2=A0 Question B: can svn merge be used to get changes from PHP_5_3 or i=
s a
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 manual merge better?

The merge tracking is an interesting option, I would greatly recommend
using it. You can easily use the "-c" option to merge a specific
revision number.

> 2) Tuesday: Change the version
> =C2=A0 $ vi branches/php_5_3_1/main/php_version.h etc.
> 3) making the branch a tag
> =C2=A0 $ 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.

$ svn copy branches/PHP_5_3_1 tags/php_5_3_1RC1

> 4) merge the tag into the PHP_5_3 branch
> =C2=A0 $ cd branches/PHP_5_3 && svn merge ../tags/php_5_3_1
> =C2=A0 The idea would be that the release appears in the
> =C2=A0 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.

> =C2=A0 Question: Does that make any sense?

IMHO, No.

> 5) Change the version to RC2-dev
> =C2=A0 $ vi branches/PHP_5_3/main/php_version.h etc.

This should be made in branches/PHP_5_3_1, before the tag is created.

> Feedback on this procedure and svn usage welcome. If this doesn't work
> out the procedure can be changed for the next release and I guess a RC
> is a better test than a "proper" release.
>
> johannes

To summarize, I would recommend the following steps:

0=C2=B0 Creating the 5.3.1 branch

  $ svn cp branches/PHP_5_3 branches/PHP_5_3_1
  $ vi branches/PHP_5_3_1/main/php_version.h etc. // Filling next tag
information, e.g. 5.3.1RC1
  $ svn ci

1=C2=B0 Creating the 5.3.1RC(\d) tag

  $ svn copy branches/PHP_5_3_1 tags/php_5_3_1RC1

2=C2=B0 Lifetime of PHP_5_3_1:

  a) Patching PHP_5_3_1
  $ svn merge -c xxxxx branches/PHP_5_3 branches/PHP_5_3_1

  b) Fixing next version info
  $ vi branches/PHP_5_3_1/main/php_version.h etc. // Filling next tag
information, e.g. 5.3.1RC2, 5.3.1...

3=C2=B0 Goto 1=C2=B0 unless tagging the final release

4=C2=B0 Tagging final release:

  $ svn copy branches/PHP_5_3_1 tags/php_5_3_1

(optionally, branches/PHP_5_3_1 could be removed, but shouldn't be
"moved" as it would make a weird graph for merges/copies tracking)

Notes:
Developers commit should be made to branches/PHP_5_3 *only*
Release manager(s) only commit "svn merge" operations to branches/PHP_5_3_1
Tags are strictly read-only copies created with "php"
Branches are always created using "PHP"

Does this sounds good for you?

--=20
Patrick Allaert
---
http://code.google.com/p/peclapm/ - Alternative PHP Monitor