summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2008-06-11 20:55:35 +0000
committerJoris Vink <joris@cvs.openbsd.org>2008-06-11 20:55:35 +0000
commit4412735dd5af87fbb626ceae083f350d006eb7ff (patch)
tree13a521818f2acb6230b0992d5a309e7f62f60b5e /usr.bin/cvs
parent52b952ebc3ff31143605788b38d890798ea23055 (diff)
do not count on files that are uptodate to be on disk in a remote setup.
Diffstat (limited to 'usr.bin/cvs')
-rw-r--r--usr.bin/cvs/diff.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 3bae718ce0d..5e13804c322 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.139 2008/06/11 02:19:13 tobias Exp $ */
+/* $OpenBSD: diff.c,v 1.140 2008/06/11 20:55:34 joris Exp $ */
/*
* Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org>
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
@@ -296,12 +296,12 @@ cvs_diff_local(struct cvs_file *cf)
}
break;
default:
- if (cf->fd == -1) {
- if (!cvs_server_active)
- cvs_log(LP_ERR, "cannot find %s",
+ if (cvs_server_active != 1 && cf->fd == -1) {
+ cvs_log(LP_ERR, "cannot find %s",
cf->file_path);
return;
}
+
if (cf->file_rcs == NULL) {
cvs_log(LP_ERR, "cannot find RCS file for %s",
cf->file_path);