[Cvs-nserver-commits] CVS: cvs-nserver/src rcs.c,1.1.1.7.4.1,1.1.1.7.4.2
Brought to you by:
tyranny
From: Alexey M. <ty...@us...> - 2002-05-29 05:06:39
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv18388 Modified Files: Tag: NCLI-1-11-1 rcs.c Log Message: Handle case where file is added locally and the working copy is being updated Index: rcs.c =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/rcs.c,v retrieving revision 1.1.1.7.4.1 retrieving revision 1.1.1.7.4.2 diff -u -d -r1.1.1.7.4.1 -r1.1.1.7.4.2 --- rcs.c 25 May 2002 20:59:50 -0000 1.1.1.7.4.1 +++ rcs.c 29 May 2002 05:06:23 -0000 1.1.1.7.4.2 @@ -8443,7 +8443,7 @@ int all_numeric; char* p; char* orig_version; - char* version; + char* version = NULL; char* branch = NULL; char* pZ; char* pT; @@ -8451,11 +8451,20 @@ /* see if the `rev' is all numeric */ all_numeric = 1; - for (p = rev; *p; p++) { - if (!isdigit(*p) && (*p != '.')) { - all_numeric = 0; - break; + if (rev) { + for (p = rev; *p; p++) { + if (!isdigit(*p) && (*p != '.')) { + all_numeric = 0; + break; + } } + } else + all_numeric = 0; + + if (!rcs) { + if (!all_numeric) + branch = rev; + goto out; } /* don't call RCS_getversion if `rev' is all numeric */ |