diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2009-04-01 06:41:59 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2009-04-01 06:41:59 +0000 |
| commit | 171b506659098a8e98bf455baca526bc8d97b3b8 (patch) | |
| tree | 24075318f399025bdf8472516b3c4f037bf9e383 /usr.bin/cvs | |
| parent | aba9b728c945004ff2fa6d66606d752b61255a9a (diff) | |
in client mode, be sure to consider the file modified if a conflict
exists in the CVS/Entries file, otherwise the server has no way
of determining if the user has resolved it or not.
also in client mode, send a conflict as Â"+=" not "+" alone, so other
cvs implementations get it.
commited entirely with opencvs,
with permission by deraadt@
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/client.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/remote.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c index 7888bca34e7..44e8feab068 100644 --- a/usr.bin/cvs/client.c +++ b/usr.bin/cvs/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.119 2009/02/23 21:28:57 tobias Exp $ */ +/* $OpenBSD: client.c,v 1.120 2009/04/01 06:41:58 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -493,7 +493,7 @@ cvs_client_sendfile(struct cvs_file *cf) sizeof(timebuf)); if (len >= sizeof(timebuf)) fatal("cvs_client_sendfile: truncation"); - len = strlcat(timebuf, "+", sizeof(timebuf)); + len = strlcat(timebuf, "+=", sizeof(timebuf)); if (len >= sizeof(timebuf)) fatal("cvs_client_sendfile: truncation"); } diff --git a/usr.bin/cvs/remote.c b/usr.bin/cvs/remote.c index f1ba28eb0ca..5ebf0b6dae4 100644 --- a/usr.bin/cvs/remote.c +++ b/usr.bin/cvs/remote.c @@ -1,4 +1,4 @@ -/* $OpenBSD: remote.c,v 1.25 2009/02/21 14:50:53 joris Exp $ */ +/* $OpenBSD: remote.c,v 1.26 2009/04/01 06:41:58 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -271,7 +271,7 @@ 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) + if (st.st_mtime != cf->file_ent->ce_mtime || cf->file_ent != NULL) cf->file_status = FILE_MODIFIED; else cf->file_status = FILE_UPTODATE; |