diff options
| author |   jfb <jfb@openbsd.org> | 2004-07-30 20:55:35 +0000 |
|---|---|---|
| committer | jfb <jfb@openbsd.org> | 2004-07-30 20:55:35 +0000 |
| commit | dd2c5b0db0e9156dac34a196e6df4fa32ef9cac4 (patch) | |
| tree | 4300b2c8e210df15bdde3e9c972587c44ca71fc1 /usr.bin/cvs/diff.c | |
| parent | Put printf arguments in correct order in a DIAGNOSTIC message. (diff) | |
| download | wireguard-openbsd-dd2c5b0db0e9156dac34a196e6df4fa32ef9cac4.tar.xz wireguard-openbsd-dd2c5b0db0e9156dac34a196e6df4fa32ef9cac4.zip | |
fix diffing by sending the base directory just before sending the 'diff'
command, and remove some debugging messages
Diffstat (limited to 'usr.bin/cvs/diff.c')
| -rw-r--r-- | usr.bin/cvs/diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index a68c2d222be..14e7c879329 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.4 2004/07/30 01:49:23 jfb Exp $ */ +/* $OpenBSD: diff.c,v 1.5 2004/07/30 20:55:35 jfb Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -421,8 +421,10 @@ cvs_diff(int argc, char **argv) cvs_file_examine(files, cvs_diff_file, &darg); root = files->cf_ddat->cd_root; - if (root->cr_method != CVS_METHOD_LOCAL) + if (root->cr_method != CVS_METHOD_LOCAL) { + cvs_senddir(root, files); cvs_sendreq(root, CVS_REQ_DIFF, NULL); + } return (0); } @@ -482,8 +484,6 @@ cvs_diff_file(struct cvs_file *cfp, void *arg) dap = (struct diff_arg *)arg; - cvs_log(LP_DEBUG, "%s: diffing %s", __func__, cfp->cf_path); - if (cfp->cf_type == DT_DIR) { root = cfp->cf_ddat->cd_root; if ((cfp->cf_parent == NULL) || |