Module Name: src
Committed By: christos
Date: Thu Mar 8 20:42:57 UTC 2012
Modified Files:
src/external/gpl2/xcvs/dist/src: recurse.c
Log Message:
restore lost fix: add nolock
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/xcvs/dist/src/recurse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/xcvs/dist/src/recurse.c
diff -u src/external/gpl2/xcvs/dist/src/recurse.c:1.1.1.1 src/external/gpl2/xcvs/dist/src/recurse.c:1.2
--- src/external/gpl2/xcvs/dist/src/recurse.c:1.1.1.1 Tue Apr 7 18:10:27 2009
+++ src/external/gpl2/xcvs/dist/src/recurse.c Thu Mar 8 15:42:56 2012
@@ -619,7 +619,7 @@ do_recursion (struct recursion_frame *fr
if (frame->flags == R_SKIP_ALL)
return 0;
- locktype = noexec ? CVS_LOCK_NONE : frame->locktype;
+ locktype = (nolock || noexec) ? CVS_LOCK_NONE : frame->locktype;
/* The fact that locks are not active here is what makes us fail to have
the
