summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/cvs/client.c4
-rw-r--r--usr.bin/cvs/remote.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c
index 7888bca34e7..44e8feab068 100644
--- a/usr.bin/cvs/client.c
+++ b/usr.bin/cvs/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.119 2009/02/23 21:28:57 tobias Exp $ */
+/* $OpenBSD: client.c,v 1.120 2009/04/01 06:41:58 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -493,7 +493,7 @@ cvs_client_sendfile(struct cvs_file *cf)
sizeof(timebuf));
if (len >= sizeof(timebuf))
fatal("cvs_client_sendfile: truncation");
- len = strlcat(timebuf, "+", sizeof(timebuf));
+ len = strlcat(timebuf, "+=", sizeof(timebuf));
if (len >= sizeof(timebuf))
fatal("cvs_client_sendfile: truncation");
}
diff --git a/usr.bin/cvs/remote.c b/usr.bin/cvs/remote.c
index f1ba28eb0ca..5ebf0b6dae4 100644
--- a/usr.bin/cvs/remote.c
+++ b/usr.bin/cvs/remote.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remote.c,v 1.25 2009/02/21 14:50:53 joris Exp $ */
+/* $OpenBSD: remote.c,v 1.26 2009/04/01 06:41:58 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -271,7 +271,7 @@ cvs_remote_classify_file(struct cvs_file *cf)
fatal("cvs_remote_classify_file(%s): %s", cf->file_path,
strerror(errno));
- if (st.st_mtime != cf->file_ent->ce_mtime)
+ if (st.st_mtime != cf->file_ent->ce_mtime || cf->file_ent != NULL)
cf->file_status = FILE_MODIFIED;
else
cf->file_status = FILE_UPTODATE;