diff options
| author | peter <peter@FreeBSD.org> | 2000-01-06 17:57:24 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2000-01-06 17:57:24 +0000 |
| commit | d8b8a4a2a7b05714878e3ad14fd527346f28f443 (patch) | |
| tree | 924e3c79c16f6863165ad17aadebc86a5cfe4520 /contrib/cvs | |
| parent | 7d2f290a36cda3d95295c3f11c4f870f55cc3d4e (diff) | |
| download | FreeBSD-src-d8b8a4a2a7b05714878e3ad14fd527346f28f443.zip FreeBSD-src-d8b8a4a2a7b05714878e3ad14fd527346f28f443.tar.gz | |
I believe this fixes the problem certain people have been seeing when doing
checkouts from a local repo and committing via remote cvs. A cvs -d
override of the mismatched CVS/Root files was missing. This is a client
side fix, I'd appreciate it if the folks having trouble with this would
update their cvs client and pay particular attention next time..
Diffstat (limited to 'contrib/cvs')
| -rw-r--r-- | contrib/cvs/src/client.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/cvs/src/client.c b/contrib/cvs/src/client.c index 748132a..eafe916 100644 --- a/contrib/cvs/src/client.c +++ b/contrib/cvs/src/client.c @@ -10,6 +10,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ +/* + * $FreeBSD$ + */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ @@ -264,7 +268,7 @@ arg_should_not_be_sent_to_server (arg) } /* Now check the value for root. */ - if (this_root && current_root + if (CVSroot_cmdline == NULL && this_root && current_root && (strcmp (this_root, current_root) != 0)) { /* Don't send this, since the CVSROOTs don't match. */ |
