diff options
| author |   joris <joris@openbsd.org> | 2006-05-31 07:21:25 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2006-05-31 07:21:25 +0000 |
| commit | c679f9fb24fbfeae11bb652e5edaf72a6f16884d (patch) | |
| tree | 00cf61db75d1e3d25b7361251367c1bdfefc4998 /usr.bin/cvs/diff.c | |
| parent | dont check for FILE_UNKNOWN twice, (diff) | |
| download | wireguard-openbsd-c679f9fb24fbfeae11bb652e5edaf72a6f16884d.tar.xz wireguard-openbsd-c679f9fb24fbfeae11bb652e5edaf72a6f16884d.zip | |
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/diff.c')
| -rw-r--r-- | usr.bin/cvs/diff.c | 4 |
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); |