Package: cvsps Version: 2.0rc1-5 Severity: important Tags: patch On anoncvs.opensource.apple.com (where access to the now-open-source WebKit is provided), some files have a branch named "TRUNK" with a revision of "1". Yes, I know that's not supposed to be possible, but they guys at Apple found a way to do it. Apparently, using "TRUNK" works in places that "HEAD" does not for some cvs commands.
The current version (2.1) will die when it hits the "TRUNK: 1" branch/revision. The attached patch will ignore any branch or tag named "TRUNK". -- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (500, 'unstable') Architecture: powerpc (ppc) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.4.20-ben7 Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Versions of packages cvsps depends on: ii cvs 1:1.12.9-13 Concurrent Versions System ii libc6 2.3.2.ds1-22 GNU C Library: Shared libraries an ii zlib1g 1:1.2.2-4 compression library - runtime cvsps recommends no packages. -- no debconf information
diff -urN cvsps-2.1.orig/cvsps.c cvsps-2.1/cvsps.c --- cvsps-2.1.orig/cvsps.c 2005-05-25 22:39:40.000000000 -0500 +++ cvsps-2.1/cvsps.c 2005-06-19 23:07:20.000000000 -0500 @@ -2104,6 +2109,11 @@ if (!get_branch_ext(rev, eot, &leaf)) { + if (strcmp(tag, "TRUNK") == 0) + { + debug(DEBUG_STATUS, "ignoring the TRUNK branch/tag"); + return; + } debug(DEBUG_APPERROR, "malformed revision"); exit(1); }