Hello Sergey,

On Sun, 23 Dec 2001, Sergey Kartashoff wrote:

>   I need to migrate latest mngosearch extension from php-4.2dev
>   branch into php-4.1.x branch.

Please do not MFH before discussing it, merging to the 4.1 branch is only
needed for important bugfixes, and not for simply updating the extension.

>
>   To do that i run:
>   cvs update -r php_4_1_1

the php_4_1_1 is the release tag, you should never touch those. The
working branch is PHP_4_0_7.

>   ... update mnogosearch files...
>   ... remove test.php ...
>   cvs remove test.php
>   ... adding index.php ...
>   cvs commit
>
>   Here is i got an error:
>
> ? ext/mnogosearch/index.php
> cvs server: sticky tag `php_4_1_1' for file `ext/mnogosearch/config.m4' is not a
>  branch
> cvs server: sticky tag `php_4_1_1' for file `ext/mnogosearch/php_mnogo.c' is not
>  a branch
> cvs server: sticky tag `php_4_1_1' for file `ext/mnogosearch/php_mnogo.h' is not
>  a branch
> Can't open test.php: No such file or directory
> cvs [server aborted]: correct above errors first!
> cvs commit: saving log message in /tmp/cvs7j5zFJ
>
>  Can anyone help me what i am doing wrong ?

The best way to prevent this kind of 'mess' is to simply have two trees on
your system, one PHP_4_0_7 branch, and one HEAD. This makes MFh way more
easier.

>
>  Another error i get while trying to add a new file index.php:
>  cvs add index.php
>
> [gluke@faust mnogosearch]$ cvs add index.php
> cvs server: cannot add file on non-branch tag php_4_1_1

php_4_1_1 is the release tag, PHP_4_0_7 is the tag for the working branch.

regards,
Derick



-- 
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Reply via email to