diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2009-04-02 09:09:41 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2009-04-02 09:09:41 +0000 |
| commit | 1c7cb8e4d51f9684990a889d00c67e7e5d2a0755 (patch) | |
| tree | c189e7b1a7092e867cbf7eb58a198840d722f4f4 /usr.bin/cvs | |
| parent | fd08ba77e8f6606fc1d8016204befa10717106ee (diff) | |
make sure diffing -rTAG -rTAG works even if files are uptodate
commited with opencvs,
with permission by deraadt@
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 44aacf04af9..43e298117ef 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.147 2009/03/23 07:28:05 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.148 2009/04/02 09:09:40 joris Exp $ */ /* * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2006 Joris Vink <joris@openbsd.org> @@ -414,6 +414,7 @@ cvs_diff_local(struct cvs_file *cf) switch (cvs_cmdop) { case CVS_OP_DIFF: if (cf->file_status == FILE_UPTODATE && diff_rev1 != NULL && + diff_rev2 == NULL && rcsnum_cmp(diff_rev1, cf->file_rcsrev, 0) == 0) goto cleanup; break; |