Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:45445
Return-Path: <johannes@php.net>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 58148 invoked from network); 31 Aug 2009 16:54:55 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 31 Aug 2009 16:54:55 -0000
Authentication-Results: pb1.pair.com smtp.mail=johannes@php.net; spf=unknown; sender-id=unknown
Authentication-Results: pb1.pair.com header.from=johannes@php.net; sender-id=unknown
Received-SPF: unknown (pb1.pair.com: domain php.net does not designate 83.243.58.133 as permitted sender)
X-PHP-List-Original-Sender: johannes@php.net
X-Host-Fingerprint: 83.243.58.133 mailout1.netbeat.de Linux 2.6
Received: from [83.243.58.133] ([83.243.58.133:58240] helo=mailout1.netbeat.de)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id A1/8B-27662-D500C9A4 for <internals@lists.php.net>; Mon, 31 Aug 2009 12:54:55 -0400
Received: (qmail 32214 invoked by uid 89); 31 Aug 2009 17:23:23 -0000
Received: from unknown (HELO ?192.168.1.111?) (postmaster%schlueters.de@62.216.220.166)
  by mailout1.netbeat.de with ESMTPA; 31 Aug 2009 17:23:23 -0000
To: Patrick ALLAERT <patrick.allaert@gmail.com>
Cc: internals@lists.php.net
In-Reply-To: <cda548cc0908310509x524f47d3h8b77971d9e4f1757@mail.gmail.com>
References: <1251556428.22693.20.camel@guybrush>
	 <cda548cc0908310509x524f47d3h8b77971d9e4f1757@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
Date: Mon, 31 Aug 2009 18:45:56 +0200
Message-ID: <1251737157.12536.4.camel@guybrush>
Mime-Version: 1.0
X-Mailer: Evolution 2.26.2 
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] Really going to 5.3.1RC1
From: johannes@php.net (Johannes =?ISO-8859-1?Q?Schl=FCter?=)


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