diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2006-05-27 17:52:28 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2006-05-27 17:52:28 +0000 |
| commit | bf6f28b10422d973ee6dbd8dee6591555eb2ecb6 (patch) | |
| tree | d5ba6b006d8d5843f8d0e63c3b03782cf6eddc6d /usr.bin/cvs | |
| parent | efc2d0e2bfd4b66f54cdb076083bb77bb720d72c (diff) | |
dont forget to expand any keywords before diffing stuff,
otherwise we might end up with chunks that are totally wrong.
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/diff.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 9abdf7aeec0..d9b7813f83d 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.92 2006/05/27 15:14:27 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.93 2006/05/27 17:52:27 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -144,6 +144,8 @@ cvs_diff_local(struct cvs_file *cf) if ((b1 = rcs_getrev(cf->file_rcs, r1)) == NULL) fatal("failed to retrieve revision %s", rbuf); + b1 = rcs_kwexp_buf(b1, cf->file_rcs, r1); + tv[0].tv_sec = rcs_rev_getdate(cf->file_rcs, r1); tv[0].tv_usec = 0; tv[1] = tv[0]; @@ -154,6 +156,8 @@ cvs_diff_local(struct cvs_file *cf) if ((b2 = rcs_getrev(cf->file_rcs, diff_rev2)) == NULL) fatal("failed to retrieve revision %s", rbuf); + b2 = rcs_kwexp_buf(b2, cf->file_rcs, diff_rev2); + tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs, diff_rev2); tv2[0].tv_usec = 0; tv2[1] = tv2[0]; |