===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/log.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- src/usr.bin/cvs/log.c	2007/05/10 20:58:02	1.39
+++ src/usr.bin/cvs/log.c	2007/06/26 02:24:10	1.40
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.39 2007/05/10 20:58:02 xsa Exp $	*/
+/*	$OpenBSD: log.c,v 1.40 2007/06/26 02:24:10 niallo Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
@@ -137,7 +137,6 @@
 
 	va_start(vap, fmt);
 
-	if (cvs_server_active) {
 		ret = vasprintf(&nstr, fmt, vap);
 		if (ret == -1)
 			fatal("cvs_printf: %s", strerror(errno));
@@ -147,12 +146,16 @@
 				for (sp = dp; *sp != '\0'; sp++)
 					;
 
-			if (send_m) {
+			if (cvs_server_active && send_m) {
 				send_m = 0;
 				putc('M', stdout);
 				putc(' ', stdout);
 			}
 
+			if (dp != nstr && dp != sp &&
+			    !strncmp(dp, LOG_REVSEP, sp - dp))
+				putc('>', stdout);
+
 			fwrite(dp, sizeof(char), (size_t)(sp - dp), stdout);
 
 			if (*sp != '\n')
@@ -163,8 +166,6 @@
 			dp = sp + 1;
 		}
 		xfree(nstr);
-	} else
-		ret = vprintf(fmt, vap);
 
 	va_end(vap);
 	return (ret);