summaryrefslogtreecommitdiff
path: root/regress/usr.bin
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2008-01-23 09:34:09 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2008-01-23 09:34:09 +0000
commitc55bd1fde22d7d1558a234e1b9f927f4f88e19ff (patch)
treeecc91c436f2dea7896982fc7ed97c33ca5baaa0a /regress/usr.bin
parent43db790d2444db5e14f6c14afb176cf515e7a09a (diff)
Don't reset the sticky tag of a file in CVS/Entries if it is not requested.
OK niallo@, xsa@
Diffstat (limited to 'regress/usr.bin')
-rw-r--r--regress/usr.bin/cvs/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/usr.bin/cvs/Makefile b/regress/usr.bin/cvs/Makefile
index 4d48d78b67e..fffc56e861f 100644
--- a/regress/usr.bin/cvs/Makefile
+++ b/regress/usr.bin/cvs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2008/01/10 12:30:09 tobias Exp $
+# $OpenBSD: Makefile,v 1.12 2008/01/23 09:34:08 tobias Exp $
# Regression tests by Niall O'Higgins <niallo@openbsd.org> and
# Tobias Stoeckmann <tobias@openbsd.org>.
@@ -178,8 +178,8 @@ test-cvs-commit-to_branch:
-m'first branch seed' > /dev/null
@eval 'test `cat ${.OBJDIR}/regress_cvs_root/seed/seed1.txt,v | wc -l` \
-eq 80'
-# @eval 'test `grep -c TFIRST_BRANCH \
-# ${.OBJDIR}/regress_cvs_wcopy/seed/CVS/Entries` -eq 2'
+ @eval 'test `grep -c TFIRST_BRANCH \
+ ${.OBJDIR}/regress_cvs_wcopy/seed/CVS/Entries` -eq 2'
test-cvs-diff:
@sleep 1