From owner-svn-src-all@FreeBSD.ORG  Fri Feb 28 19:51:48 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 00A2E66A;
 Fri, 28 Feb 2014 19:51:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E15E01147;
 Fri, 28 Feb 2014 19:51:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1SJpltx055110;
 Fri, 28 Feb 2014 19:51:47 GMT (envelope-from jmg@svn.freebsd.org)
Received: (from jmg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1SJplBs055109;
 Fri, 28 Feb 2014 19:51:47 GMT (envelope-from jmg@svn.freebsd.org)
Message-Id: <201402281951.s1SJplBs055109@svn.freebsd.org>
From: John-Mark Gurney <jmg@FreeBSD.org>
Date: Fri, 28 Feb 2014 19:51:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262619 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Feb 2014 19:51:48 -0000

Author: jmg
Date: Fri Feb 28 19:51:47 2014
New Revision: 262619
URL: http://svnweb.freebsd.org/changeset/base/262619

Log:
  since -F is safe, and an update from 10-HEAD to 10-STABLE is sooo bloody
  anoying w/o it..  recommend people use -F too...

Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Feb 28 19:21:07 2014	(r262618)
+++ head/UPDATING	Fri Feb 28 19:51:47 2014	(r262619)
@@ -1953,9 +1953,9 @@ COMMON ITEMS:
 	make kernel KERNCONF=YOUR_KERNEL_HERE
 							[1]
 	<reboot in single user>				[3]
-	mergemaster -p					[5]
+	mergemaster -Fp					[5]
 	make installworld
-	mergemaster -i					[4]
+	mergemaster -Fi					[4]
 	make delete-old					[6]
 	<reboot>
 
@@ -1990,9 +1990,9 @@ COMMON ITEMS:
 	make kernel KERNCONF=YOUR_KERNEL_HERE		[8]
 							[1]
 	<reboot in single user>				[3]
-	mergemaster -p					[5]
+	mergemaster -Fp					[5]
 	make installworld
-	mergemaster -i					[4]
+	mergemaster -Fi					[4]
 	make delete-old					[6]
 	<reboot>