summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobias <tobias@openbsd.org>2008-09-12 13:38:35 +0000
committertobias <tobias@openbsd.org>2008-09-12 13:38:35 +0000
commit42f3571fad45b346cd40717d8d5ad19877310f24 (patch)
treeab4d19c4867aa9213ff461f2cc02cf1aa2ded4db
parent- make it possible to use a user defined MERGE_CMD instead of sdiff (diff)
downloadwireguard-openbsd-42f3571fad45b346cd40717d8d5ad19877310f24.tar.xz
wireguard-openbsd-42f3571fad45b346cd40717d8d5ad19877310f24.zip
Move the revision selection in front of output, so errors won't mix up
with output. Matches GNU cvs.
-rw-r--r--usr.bin/cvs/getlog.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c
index b64a58c964b..3f4cc05459b 100644
--- a/usr.bin/cvs/getlog.c
+++ b/usr.bin/cvs/getlog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getlog.c,v 1.89 2008/06/14 04:34:08 tobias Exp $ */
+/* $OpenBSD: getlog.c,v 1.90 2008/09/12 13:38:35 tobias Exp $ */
/*
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
@@ -215,6 +215,11 @@ cvs_log_local(struct cvs_file *cf)
return;
}
+ if (logrev != NULL)
+ nrev = cvs_revision_select(cf->file_rcs, logrev);
+ else
+ nrev = cf->file_rcs->rf_ndelta;
+
cvs_printf("\nRCS file: %s", cf->file_rpath);
if (cvs_cmdop != CVS_OP_RLOG)
@@ -260,11 +265,6 @@ cvs_log_local(struct cvs_file *cf)
cvs_printf("total revisions: %u", cf->file_rcs->rf_ndelta);
- if (logrev != NULL)
- nrev = cvs_revision_select(cf->file_rcs, logrev);
- else
- nrev = cf->file_rcs->rf_ndelta;
-
if (cf->file_rcs->rf_head != NULL &&
!(runflags & L_HEAD) && !(runflags & L_HEAD_DESCR))
cvs_printf(";\tselected revisions: %u", nrev);