diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2006-06-13 06:51:33 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2006-06-13 06:51:33 +0000 |
| commit | 8812808c5ee5d8b84b2f009b31c31cf8fcfff970 (patch) | |
| tree | d248bb5ae6081307b4a0f3c8b6fafbc5dc659793 /usr.bin | |
| parent | aa1093158a4c76f1ae4b1ee8c4267d96f4677681 (diff) | |
files that are not checked out are not up-to-date, consider
this a conflict and block the commit when we encounter any of these.
and make an error message a bit more fluffy and accurate.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/commit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 860afe03eeb..bbf588fefb4 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.71 2006/06/07 07:01:12 xsa Exp $ */ +/* $OpenBSD: commit.c,v 1.72 2006/06/13 06:51:32 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -86,7 +86,7 @@ cvs_commit(int argc, char **argv) argv += optind; if (logmsg == NULL) - fatal("please use -m to specify a log message for now"); + fatal("please use -m or -F to specify a log message for now"); TAILQ_INIT(&files_affected); conflicts_found = 0; @@ -143,7 +143,8 @@ cvs_commit_check_conflicts(struct cvs_file *cf) } if (cf->file_status == FILE_MERGE || - cf->file_status == FILE_PATCH) { + cf->file_status == FILE_PATCH || + cf->file_status == FILE_CHECKOUT) { cvs_log(LP_ERR, "conflict: %s is not up-to-date", cf->file_path); conflicts_found++; |