diff options
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index 8cf2ecd79fb..72ff91c3323 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.203 2007/10/05 19:28:23 gilles Exp $ */ +/* $OpenBSD: file.c,v 1.204 2007/10/09 12:20:24 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -815,7 +815,7 @@ cvs_file_classify(struct cvs_file *cf, const char *tag) "locally modified", cf->file_path); cf->file_status = FILE_CONFLICT; - } else { + } else if (cvs_cmdop != CVS_OP_IMPORT) { cvs_log(LP_NOTICE, "%s is no longer in the " "repository", |