From 4744700f60bc002db218cc70a7a334b0a093322a Mon Sep 17 00:00:00 2001 From: Joris Vink Date: Wed, 31 May 2017 16:48:17 +0000 Subject: Do not use CVS_LOCK_REPO for committing. This flag tells our file recursion code that for each directory entered we should lock it. Commit however locks all relevant directories on its own when it is about to make changes and should not depend on the file recursion code to do so. --- usr.bin/cvs/commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 8d9cbf6ae02..d15aaec8d1c 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.156 2017/05/28 17:01:10 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.157 2017/05/31 16:48:16 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * Copyright (c) 2006 Xavier Santolaria @@ -51,7 +51,7 @@ char *loginfo = NULL; static int conflicts_found; struct cvs_cmd cvs_cmd_commit = { - CVS_OP_COMMIT, CVS_USE_WDIR | CVS_LOCK_REPO, "commit", + CVS_OP_COMMIT, CVS_USE_WDIR, "commit", { "ci", "com" }, "Check files into the repository", "[-flR] [-F logfile | -m msg] [-r rev] ...", -- cgit v1.2.3