diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-02-10 13:07:59 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-02-10 13:07:59 +0000 |
| commit | da6a2cfcc03b253b57694c243c7a1c428d43e719 (patch) | |
| tree | 68deb344639a794e4f665e4a3721d8054cefcff2 /usr.bin | |
| parent | b249eb59e8a0195ea9125dc8b79d360fd6a448c7 (diff) | |
do not allow commits to files that have a sticky date set
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/commit.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 48116852fcc..b8a181bc80d 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.127 2008/02/04 22:36:40 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.128 2008/02/10 13:07:58 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -215,6 +215,13 @@ cvs_commit_check_files(struct cvs_file *cf) return; } + if (cf->file_ent != NULL && cf->file_ent->ce_date != -1) { + cvs_log(LP_ERR, "conflict: cannot commit to sticky date for %s", + cf->file_path); + conflicts_found++; + return; + } + if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) { tag = cvs_directory_tag; if (cf->file_ent != NULL) |