summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/commit.c
diff options
context:
space:
mode:
authorjoris <joris@openbsd.org>2007-06-28 17:45:49 +0000
committerjoris <joris@openbsd.org>2007-06-28 17:45:49 +0000
commit7cffd7e4aa84e89ded922aaf94b707e0bf49a362 (patch)
treefc9619fb374ad0c0741ce8a912a8b445571c512f /usr.bin/cvs/commit.c
parentBring the index defines back in sync with struct nlist after removal of IPX (diff)
downloadwireguard-openbsd-7cffd7e4aa84e89ded922aaf94b707e0bf49a362.tar.xz
wireguard-openbsd-7cffd7e4aa84e89ded922aaf94b707e0bf49a362.zip
When commiting to a server in a remote setup classify
the files based upon their entry in CVS/Entries instead of using the local classifying code and trying to locate the RCSfile on our local disks, which ofc does not work correctly. OK niallo@
Diffstat (limited to 'usr.bin/cvs/commit.c')
-rw-r--r--usr.bin/cvs/commit.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c
index 2d686047b7a..afa9c6ed9a0 100644
--- a/usr.bin/cvs/commit.c
+++ b/usr.bin/cvs/commit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: commit.c,v 1.107 2007/06/18 17:54:13 joris Exp $ */
+/* $OpenBSD: commit.c,v 1.108 2007/06/28 17:45:49 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
* Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -153,7 +153,10 @@ cvs_commit_check_files(struct cvs_file *cf)
{
cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path);
- cvs_file_classify(cf, NULL);
+ if (current_cvsroot->cr_method != CVS_METHOD_LOCAL)
+ cvs_remote_classify_file(cf);
+ else
+ cvs_file_classify(cf, NULL);
if (cf->file_type == CVS_DIR) {
if (verbosity > 1)