diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2009-04-02 20:57:48 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2009-04-02 20:57:48 +0000 |
| commit | 47fab31c36bbdf07881f640d6b1c89681048b6d1 (patch) | |
| tree | 3b5b8da49fa735c2c6271de65c4610e8b9760c50 /usr.bin | |
| parent | 1c883d7b47a1b2c671aa69fe7e2b9530da88bfdf (diff) | |
if ce_conflict != NULL, the file should be sent
to the server for verification.
commited with opencvs,
permission by deraadt@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/remote.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/cvs/remote.c b/usr.bin/cvs/remote.c index 5ebf0b6dae4..1bd15dd964c 100644 --- a/usr.bin/cvs/remote.c +++ b/usr.bin/cvs/remote.c @@ -1,4 +1,4 @@ -/* $OpenBSD: remote.c,v 1.26 2009/04/01 06:41:58 joris Exp $ */ +/* $OpenBSD: remote.c,v 1.27 2009/04/02 20:57:47 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -271,7 +271,8 @@ cvs_remote_classify_file(struct cvs_file *cf) fatal("cvs_remote_classify_file(%s): %s", cf->file_path, strerror(errno)); - if (st.st_mtime != cf->file_ent->ce_mtime || cf->file_ent != NULL) + if (st.st_mtime != cf->file_ent->ce_mtime || + cf->file_ent->ce_conflict != NULL) cf->file_status = FILE_MODIFIED; else cf->file_status = FILE_UPTODATE; |