summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2010-03-18 21:17:49 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2010-03-18 21:17:49 +0000
commit3f331aaf26be69ae89774824f7fe6ed8264c9194 (patch)
tree429a8870e07ce44b1c12e0b88e9ec0d1c2a4b353
parentc6d288a6bbd3e42cb0fce5241cb636dc826af5df (diff)
move to 4.7-current
-rw-r--r--sys/conf/newvers.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 7e97800d3aa..9cba8df26b6 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: newvers.sh,v 1.103 2010/03/05 10:59:35 miod Exp $
+# $OpenBSD: newvers.sh,v 1.104 2010/03/18 21:17:48 otto Exp $
# $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -59,15 +59,17 @@ id=`basename ${d}`
# -current and -beta tagging:
# For release, select STATUS ""
# Right after release unlock, select STATUS "-current"
+# and enable POOL_DEBUG in sys/conf/GENERIC
# A month or so before release, select STATUS "-beta"
+# and disable POOL_DEBUG in sys/conf/GENERIC
ost="OpenBSD"
osr="4.7"
cat >vers.c <<eof
-#define STATUS "" /* release */
-#if 0
#define STATUS "-current" /* just after a release */
+#if 0
+#define STATUS "" /* release */
#define STATUS "-beta" /* just before a release */
#endif