summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid D. Kilzer <ddkilzer@kilzer.net>2005-06-20 00:57:56 +0200
committerYann Dirson <ydirson@altern.org>2006-06-16 23:00:37 +0200
commit8baa15178e4662a22d8e3ac7da771f61fa964abd (patch)
tree8da5c60531f111054151fa5566fb22934185dd75
parent271878e8ac8860c562917e651f0c48235e39ca1f (diff)
downloadcvsps-8baa15178e4662a22d8e3ac7da771f61fa964abd.tar.gz
cvsps: should ignore TRUNK branch if it exists in log
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".
-rw-r--r--cvsps.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/cvsps.c b/cvsps.c
index be700ba..3143def 100644
--- a/cvsps.c
+++ b/cvsps.c
@@ -2144,6 +2144,11 @@ static void parse_sym(CvsFile * file, char * sym)
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);
}