On Wed, 28 Jan 2004, Martin Kraemer wrote:
>On Wed, Jan 28, 2004 at 05:31:14PM +0100, Derick Rethans wrote:
>> On Wed, 28 Jan 2004, Martin Kraemer wrote:
>>
>> > martin Wed Jan 28 11:27:43 2004 EDT
>> >
>> > Modified files: (Branch: 1)
>>
>> What is branch 1?
>
>Ughhh.. Good question. I meant to use HEAD (which is 1.*) because that's
>where the php5 commits are added. I used "cvs up -A" for that.
>
>When I do "cvs stat -v" to see the tagged branches, I see no branch
>for PHP*5* (which makes sense, too, because it's supposed to be HEAD,
>not a branch).
>
>I am puzzled: What would have been the correct way?
Have a checkout for each branch. That's the safest way.
Then commit in each. The branches differ so much that
doing any merging, etc. using the cvs commands propably
won't work anyway.
Always make sure you have correct checkouts:
php4/ # cvs up -dP -rPHP_4_3
php5/ # cvs up -dPA
Latter cleans away all empty directories and resets any tags.
--Jani
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
