diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2006-05-27 14:05:54 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2006-05-27 14:05:54 +0000 |
| commit | ccdded852c8d11d84b32ac0f101a442c5982b71c (patch) | |
| tree | 6872fd6601da446d257114653e1b790f3b9831ab /usr.bin | |
| parent | b40cf0ca3671219ffc3a641ea1fe7920cfa14eb5 (diff) | |
dont allow commit to continue if the file that is being
commited needs to be updated or merged first.
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 e9ea8d0e3e9..524c7babee9 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.56 2006/05/27 06:16:14 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.57 2006/05/27 14:05:53 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -115,6 +115,13 @@ cvs_commit_check_conflicts(struct cvs_file *cf) cf->file_status == FILE_UNLINK) conflicts_found++; + if (cf->file_status == FILE_MERGE || + cf->file_status == FILE_PATCH) { + cvs_log(LP_ERR, "conflict: %s is not up-to-date", + cf->file_path); + conflicts_found++; + } + if (cf->file_status == FILE_ADDED || cf->file_status == FILE_REMOVED || cf->file_status == FILE_MODIFIED) |