Date: Sun, 22 Jan 2012 16:33:39 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 205007 for review Message-ID: <201201221633.q0MGXdDj025624@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@205007?ac=10 Change 205007 by rene@rene_acer on 2012/01/22 16:33:17 Remove the instructions in case mergemaster(8) has no -p option, the oldest supported release (7.3) has it. Idea from http://wiki.freebsd.org/DocIdeaList Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#30 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#30 (text+ko) ==== @@ -2122,13 +2122,7 @@ pre-buildworld mode by providing the <option>-p</option> option. This will compare only those files that are essential for the success of <maketarget>buildworld</maketarget> or - <maketarget>installworld</maketarget>. If your old version of - <command>mergemaster</command> does not support <option>-p</option>, - use the new version in the source tree when running for the first - time:</para> - - <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/mergemaster</userinput> -&prompt.root; <userinput>./mergemaster.sh -p</userinput></screen> + <maketarget>installworld</maketarget>.</para> <tip> <para>If you are feeling particularly paranoid, you can check your
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201221633.q0MGXdDj025624>