svn commit: r340470 - releng/12.0/sys/conf

[Glen Barber]

Author: gjb
Date: Fri Nov 16 00:00:59 2018
New Revision: 340470
URL: https://svnweb.freebsd.org/changeset/base/340470

Log:
  - Copy stable/12 at r340462 to releng/12.0 as part of the 12.0-RELEASE
    cycle.
  - Prune svn:mergeinfo from the new branch.
  - Update from BETA4 to RC1.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Added:
     - copied from r340462, stable/12/
Directory Properties:
  releng/12.0/   (props changed)
Modified:
  releng/12.0/sys/conf/newvers.sh

Modified: releng/12.0/sys/conf/newvers.sh
==============================================================================
--- stable/12/sys/conf/newvers.sh	Thu Nov 15 19:06:07 2018	(r340462)
+++ releng/12.0/sys/conf/newvers.sh	Fri Nov 16 00:00:59 2018	(r340470)
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.0"
-BRANCH="BETA4"
+BRANCH="RC1"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi