summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2006-05-31 07:21:26 +0000
committerJoris Vink <joris@cvs.openbsd.org>2006-05-31 07:21:26 +0000
commitc2b7617456b60be1b8ea1627fcd21fde29975f26 (patch)
treea58ff24b97cab44b9e0b5b172a10f48da2a45a97 /usr.bin/cvs
parentda368f85af12df32a35179775da1b91a9959b6ef (diff)
set diff_rev2 to file_rcsrev when we are using
the file we have on disk as the second thing to diff to. fixes some output issues.
Diffstat (limited to 'usr.bin/cvs')
-rw-r--r--usr.bin/cvs/diff.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 48b9befe6ef..b3bfa5e67c8 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.99 2006/05/30 22:25:24 joris Exp $ */
+/* $OpenBSD: diff.c,v 1.100 2006/05/31 07:21:25 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -198,6 +198,8 @@ cvs_diff_local(struct cvs_file *cf)
tv2[0].tv_sec = st.st_mtime;
tv2[0].tv_usec = 0;
tv2[1] = tv2[0];
+
+ diff_rev2 = cf->file_rcsrev;
}
cvs_printf("%s", diffargs);