CVS problems with -r

CVS problems with -r

[Corinna Vinschen]

Hi,

I've applied some patches to /cvs/cygwin-apps/cygrunsrv, tagged the latest
version with

  cvs tag rel0-96-1

and then tried to export for the release using the following command:

  cvs -d :ext:corinna@cygwin.com:/cvs/cygwin-apps ex \
      -r rel0-96-1 \
      -d cygrunsrv-0.96-1 \
      cygrunsrv

I got the following loooong reply:

: ../../coolo-cvs/src/lock.c:177: lock_name: Assertion `(__extension__ (__bui
ltin_constant_p (strlen (current_parsed_root->directory)) && ((__builtin_constan
t_p (repository) && strlen (repository) < ((size_t) (strlen (current_parsed_root
->directory)))) || (__builtin_constant_p (current_parsed_root->directory) && str
len (current_parsed_root->directory) < ((size_t) (strlen (current_parsed_root->d
irectory))))) ? __extension__ ({ size_t __s1_len, __s2_len; (__builtin_constant_
p (repository) && __builtin_constant_p (current_parsed_root->directory) && (__s1
_len = strlen (repository), __s2_len = strlen (current_parsed_root->directory), 
(!((size_t)(const void *)((repository) + 1) - (size_t)(const void *)(repository)
 == 1) || __s1_len >= 4) && (!((size_t)(const void *)((current_parsed_root->dire
ctory) + 1) - (size_t)(const void *)(current_parsed_root->directory) == 1) || __
s2_len >= 4)) ? memcmp ((__const char *) (repository), (__const char *) (current
_parsed_root->directory), (__s1_len < __s2_len ? __s1_len : __s2_len) + 1) : (__
builtin_constant_p (repository) && ((size_t)(const void *)((repository) + 1) - (
size_t)(const void *)(repository) == 1) && (__s1_len = strlen (repository), __s1
_len < 4) ? (__builtin_constant_p (current_parsed_root->directory) && ((size_t)(
const void *)((current_parsed_root->directory) + 1) - (size_t)(const void *)(cur
rent_parsed_root->directory) == 1) ? (__extension__ ({ register int __result = (
((__const unsigned char *) (__const char *) (repository))[0] - ((__const unsigne
d char *) (__const char *)(current_parsed_root->directory))[0]); if (__s1_len > 
0 && __result == 0) { __result = (((__const unsigned char *) (__const char *) (r
epository))[1] - ((__const unsigned char *) (__const char *) (current_parsed_roo
t->directory))[1]); if (__s1_len > 1 && __result == 0) { __result = (((__const u
nsigned char *) (__const char *) (repository))[2] - ((__const unsigned char *) (
__const char *) (current_parsed_root->directory))[2]); if (__s1_len > 2 && __res
ult == 0) __result = (((__const unsigned char *) (__const char *) (repository))[
3] - ((__const unsigned char *) (__const char *) (current_parsed_root->directory
))[3]); } } __result; })) : (__extension__ ({ __const unsigned char *__s2 = (__c
onst unsigned char *) (__const char *) (current_parsed_root->directory); registe
r int __result = (((__const unsigned char *) (__const char *) (repository))[0] -
 __s2[0]); if (__s1_len > 0 && __result == 0) { __result = (((__const unsigned c
har *) (__const char *) (repository))[1] - __s2[1]); if (__s1_len > 1 && __resul
t == 0) { __result = (((__const unsigned char *) (__const char *) (repository))[
2] - __s2[2]); if (__s1_len > 2 && __result == 0) __result = (((__const unsigned
 char *) (__const char *) (repository))[3] - __s2[3]); } } __result; }))) : (__b
uiltin_constant_p (current_parsed_root->directory) && ((size_t)(const void *)((c
urrent_parsed_root->directory) + 1) - (size_t)(const void *)(current_parsed_root
->directory) == 1) && (__s2_len = strlen (current_parsed_root->directory), __s2_
len < 4) ? (__builtin_constant_p (repository) && ((size_t)(const void *)((reposi
tory) + 1) - (size_t)(const void *)(repository) == 1) ? (__extension__ ({ regist
er int __result = (((__const unsigned char *) (__const char *) (repository))[0] 
- ((__const unsigned char *) (__const char *)(current_parsed_root->directory))[0
]); if (__s2_len > 0 && __result == 0) { __result = (((__const unsigned char *) 
(__const char *) (repository))[1] - ((__const unsigned char *) (__const char *) 
(current_parsed_root->directory))[1]); if (__s2_len > 1 && __result == 0) { __re
sult = (((__const unsigned char *) (__const char *) (repository))[2] - ((__const
 unsigned char *) (__const char *) (current_parsed_root->directory))[2]); if (__
s2_len > 2 && __result == 0) __result = (((__const unsigned char *) (__const cha
r *) (repository))[3] - ((__const unsigned char *) (__const char *) (current_par
sed_root->directory))[3]); } } __result; })) : (__extension__ ({ __const unsigne
d char *__s1 = (__const unsigned char *) (__const char *) (repository); register
 int __result = __s1[0] - ((__const unsigned char *) (__const char *) (current_p
arsed_root->directory))[0]; if (__s2_len > 0 && __result == 0) { __result = (__s
1[1] - ((__const unsigned char *) (__const char *) (current_parsed_root->directo
ry))[1]); if (__s2_len > 1 && __result == 0) { __result = (__s1[2] - ((__const u
nsigned char *) (__const char *) (current_parsed_root->directory))[2]); if (__s2
_len > 2 && __result == 0) __result = (__s1[3] - ((__const unsigned char *) (__c
onst char *) (current_parsed_root->directory))[3]); } } __result; }))) : strcmp 
(repository, current_parsed_root->directory)))); }) : strncmp (repository, curre
nt_parsed_root->directory, strlen (current_parsed_root->directory)))) == 0' fail
ed.
cvs [export aborted]: received abort signal
cvs: ../../coolo-cvs/src/lock.c:177: lock_name: Assertion `(__extension__ (__bui
ltin_constant_p (strlen (current_parsed_root->directory)) && ((__builtin_constan
t_p (repository) && strlen (repository) < ((size_t) (strlen (current_parsed_root
->directory)))) || (__builtin_constant_p (current_parsed_root->directory) && str
len (current_parsed_root->directory) < ((size_t) (strlen (current_parsed_root->d
irectory))))) ? __extension__ ({ size_t __s1_len, __s2_len; (__builtin_constant_
p (repository) && __builtin_constant_p (current_parsed_root->directory) && (__s1
_len = strlen (repository), __s2_len = strlen (current_parsed_root->directory), 
(!((size_t)(const void *)((repository) + 1) - (size_t)(const void *)(repository)
 == 1) || __s1_len >= 4) && (!((size_t)(const void *)((current_parsed_root->dire
ctory) + 1) - (size_t)(const void *)(current_parsed_root->directory) == 1) || __
s2_len >= 4)) ? memcmp ((__const char *) (repository), (__const char *) (current
_parsed_root->directory), (__s1_len < __s2_len ? __s1_len : __s2_len) + 1) : (__
builtin_constant_p (repository) && ((size_t)(const void *)((repository) + 1) - (
size_t)(const void *)(repository) == 1) && (__s1_len = strlen (repository), __s1
_len < 4) ? (__builtin_constant_p (current_parsed_root->directory) && ((size_t)(
const void *)((current_parsed_root->directory) + 1) - (size_t)(const void *)(cur
rent_parsed_root->directory) == 1) ? (__extension__ ({ register int __result = (
((__const unsigned char *) (__const char *) (repository))[0] - ((__const unsigne
d char *) (__const char *)(current_parsed_root->directory))[0]); if (__s1_len > 
0 && __result == 0) { __result = (((__const unsigned char *) (__const char *) (r
epository))[1] - ((__const unsigned char *) (__const char *) (current_parsed_roo
t->directory))[1]); if (__s1_len > 1 && __result == 0) { __result = (((__const u
nsigned char *) (__const char *) (repository))[2] - ((__const unsigned char *) (
__const char *) (current_parsed_root->directory))[2]); if (__s1_len > 2 && __res
ult == 0) __result = (((__const unsigned char *) (__const char *) (repository))[
3] - ((__const unsigned char *) (__const char *) (current_parsed_root->directory
))[3]); } } __result; })) : (__extension__ ({ __const unsigned char *__s2 = (__c
onst unsigned char *) (__const char *) (current_parsed_root->directory); registe
r int __result = (((__const unsigned char *) (__const char *) (repository))[0] -
 __s2[0]); if (__s1_len > 0 && __result == 0) { __result = (((__const unsigned c
har *) (__const char *) (repository))[1] - __s2[1]); if (__s1_len > 1 && __resul
t == 0) { __result = (((__const unsigned char *) (__const char *) (repository))[
2] - __s2[2]); if (__s1_len > 2 && __result == 0) __result = (((__const unsigned
 char *) (__const char *) (repository))[3] - __s2[3]); } } __result; }))) : (__b
uiltin_constant_p (current_parsed_root->directory) && ((size_t)(const void *)((c
urrent_parsed_root->directory) + 1) - (size_t)(const void *)(current_parsed_root
->directory) == 1) && (__s2_len = strlen (current_parsed_root->directory), __s2_
len < 4) ? (__builtin_constant_p (repository) && ((size_t)(const void *)((reposi
tory) + 1) - (size_t)(const void *)(repository) == 1) ? (__extension__ ({ regist
er int __result = (((__const unsigned char *) (__const char *) (repository))[0] 
- ((__const unsigned char *) (__const char *)(current_parsed_root->directory))[0
]); if (__s2_len > 0 && __result == 0) { __result = (((__const unsigned char *) 
(__const char *) (repository))[1] - ((__const unsigned char *) (__const char *) 
(current_parsed_root->directory))[1]); if (__s2_len > 1 && __result == 0) { __re
sult = (((__const unsigned char *) (__const char *) (repository))[2] - ((__const
 unsigned char *) (__const char *) (current_parsed_root->directory))[2]); if (__
s2_len > 2 && __result == 0) __result = (((__const unsigned char *) (__const cha
r *) (repository))[3] - ((__const unsigned char *) (__const char *) (current_par
sed_root->directory))[3]); } } __result; })) : (__extension__ ({ __const unsigne
d char *__s1 = (__const unsigned char *) (__const char *) (repository); register
 int __result = __s1[0] - ((__const unsigned char *) (__const char *) (current_p
arsed_root->directory))[0]; if (__s2_len > 0 && __result == 0) { __result = (__s
1[1] - ((__const unsigned char *) (__const char *) (current_parsed_root->directo
ry))[1]); if (__s2_len > 1 && __result == 0) { __result = (__s1[2] - ((__const u
nsigned char *) (__const char *) (current_parsed_root->directory))[2]); if (__s2
_len > 2 && __result == 0) __result = (__s1[3] - ((__const unsigned char *) (__c
onst char *) (current_parsed_root->directory))[3]); } } __result; }))) : strcmp 
(repository, current_parsed_root->directory)))); }) : strncmp (repository, curre
nt_parsed_root->directory, strlen (current_parsed_root->directory)))) == 0' fail
ed.
cvs [export aborted]: received abort signal


Trying to workaround that problem I found the following facts:

- It happens on Linux as well as on Cygwin so I guess it's not a problem
  of the client.

- Adding another tag and using that one doesn't help.

- Using another older tag (rel0-95-1) works!

- cvs checkout with the rel0-96-1 tag also doesn't work so it's not a
  specific problem of the export command.

What can I do to get this tag working?  What might have happend that it
doesn't work?

Irritated,
Corinna

-- 
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.
mailto:vinschen@redhat.com

Re: CVS problems with -r

[Christopher Faylor]

On Thu, Apr 24, 2003 at 11:31:35AM +0200, Corinna Vinschen wrote:
>What can I do to get this tag working?  What might have happend that it
>doesn't work?

Use underscores rather than dashes?

cg

Re: CVS problems with -r

[Corinna Vinschen]

On Thu, Apr 24, 2003 at 10:52:44AM -0400, Christopher Faylor wrote:
> On Thu, Apr 24, 2003 at 11:31:35AM +0200, Corinna Vinschen wrote:
> >What can I do to get this tag working?  What might have happend that it
> >doesn't work?
> 
> Use underscores rather than dashes?

Unlikely, since otherwise "rel0-95-1" wouldn't work.  But it does.
It's only the "rel0-96-1" tag which doesn't work.  As I wrote in my
original posting, adding another new tag called "rel96" and trying to
use that results in the same error.

Corinna

-- 
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.
mailto:vinschen@redhat.com

Re: CVS problems with -r

[Ian Lance Taylor]

Corinna Vinschen <vinschen@redhat.com> writes:

> I've applied some patches to /cvs/cygwin-apps/cygrunsrv, tagged the latest
> version with
> 
>   cvs tag rel0-96-1
> 
> and then tried to export for the release using the following command:
> 
>   cvs -d :ext:corinna@cygwin.com:/cvs/cygwin-apps ex \
>       -r rel0-96-1 \
>       -d cygrunsrv-0.96-1 \
>       cygrunsrv

...

> Trying to workaround that problem I found the following facts:
> 
> - It happens on Linux as well as on Cygwin so I guess it's not a problem
>   of the client.
> 
> - Adding another tag and using that one doesn't help.
> 
> - Using another older tag (rel0-95-1) works!
> 
> - cvs checkout with the rel0-96-1 tag also doesn't work so it's not a
>   specific problem of the export command.
> 
> What can I do to get this tag working?  What might have happend that it
> doesn't work?

It looks like a bug in CVS related to having the repository be a
symlink.  The assertion error occurs when CVS compares the repository
you named
    /cvs/cygwin-apps
with the result of a string it gets from doing pwd in the repository
    /sourceware/projects/cygwin-apps-home/cvsfiles
CVS expects the strings to be identical.

The error only occurs with rel0-96-1 because CVS is trying to verify
that that is a valid tag.  It doesn't need to verify rel0-95-1 because
that tag is already listed in the CVSROOT/val-tags file.

It should work to simply use the resolved directory name as the -d
option.  That is, do this:
    /sourceware/projects/cygwin-apps-home/cvsfiles

  cvs -d :ext:corinna@cygwin.com:/sourceware/projects/cygwin-apps-home/cvsfiles ex \
      -r rel0-96-1 \
      -d cygrunsrv-0.96-1 \
      cygrunsrv

Let us know if it works.  Once you do that once, the val-tags file
should be updated, and afterward you should be able to use
/cvs/cygwin-apps again.

Ian

Re: CVS problems with -r

[Corinna Vinschen]

On Thu, Apr 24, 2003 at 09:46:07AM -0700, Ian Lance Taylor wrote:
> It should work to simply use the resolved directory name as the -d
> option.  That is, do this:
>     /sourceware/projects/cygwin-apps-home/cvsfiles
> 
>   cvs -d :ext:corinna@cygwin.com:/sourceware/projects/cygwin-apps-home/cvsfiles ex \
>       -r rel0-96-1 \
>       -d cygrunsrv-0.96-1 \
>       cygrunsrv
> 
> Let us know if it works.  Once you do that once, the val-tags file
> should be updated, and afterward you should be able to use
> /cvs/cygwin-apps again.

Thanks Ian, yes, it worked as you described.

Corinna

-- 
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.
mailto:vinschen@redhat.com