Date: Fri, 28 Feb 2014 19:51:47 +0000 (UTC) From: John-Mark Gurney <jmg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r262619 - head Message-ID: <201402281951.s1SJplBs055109@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402281951.s1SJplBs055109>