diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-05-30 09:11:25 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-05-30 09:11:25 +0000 |
| commit | 2ceddb5b3b1e6f7129602bba2f5e3fff8dd1d8c3 (patch) | |
| tree | dc6ba3d789f624ebec4e891c1ad2198be173221f /usr.bin/cvs | |
| parent | d3899a87779d1cd21c755d866d11dc07925977e3 (diff) | |
handle lost files, modified files and files with conflicts; OK joris@.
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/add.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/cvs/add.c b/usr.bin/cvs/add.c index 63bbee32c86..92478a002b8 100644 --- a/usr.bin/cvs/add.c +++ b/usr.bin/cvs/add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: add.c,v 1.49 2006/05/30 08:23:31 xsa Exp $ */ +/* $OpenBSD: add.c,v 1.50 2006/05/30 09:11:24 xsa Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -230,6 +230,9 @@ add_file(struct cvs_file *cf) } stop = 1; break; + case FILE_CONFLICT: + case FILE_LOST: + case FILE_MODIFIED: case FILE_UPTODATE: if (cf->file_rcs != NULL && cf->file_rcs->rf_dead == 0) { cvs_log(LP_NOTICE, "%s already exists, with version " |