From 171b506659098a8e98bf455baca526bc8d97b3b8 Mon Sep 17 00:00:00 2001 From: Joris Vink Date: Wed, 1 Apr 2009 06:41:59 +0000 Subject: 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit also in client mode, send a conflict as Â"+=" not "+" alone, so other cvs implementations get it. commited entirely with opencvs, with permission by deraadt@ --- usr.bin/cvs/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.bin/cvs/client.c') 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 * @@ -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"); } -- cgit v1.2.3