Date: Tue, 17 Apr 2018 10:54:36 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51558 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201804171054.w3HAsa2s064616@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Apr 17 10:54:36 2018 New Revision: 51558 URL: https://svnweb.freebsd.org/changeset/doc/51558 Log: Expand a bit the last step of the exp-run procedure. Sponsored by: Absolight Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Apr 16 16:11:13 2018 (r51557) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Apr 17 10:54:36 2018 (r51558) @@ -5072,11 +5072,32 @@ Do you want to commit? (no = start a shell) [y/n]</scr </step> <step> - <para>When the &a.portmgr; replies, fix the fallout. - The fallout might be a bug in the original patch or - other ports that need to be fixed. Both need to be - addressed. Update the patch to repair all the - fallout and repeat.</para> + <para>&a.portmgr; will replies with a possible + fallout.</para> + </step> + + <step> + <para>Depending on the fallout:</para> + + <stepalternatives> + <step> + <para>If there is no fallout, the procedure stops + here, and the change can be committed, pending + any other approval required.</para> + </step> + + <step> + <para>If there is fallout, it + <emphasis>must</emphasis> be fixed, either by + fixing the ports directly in the ports tree, or + adding to the submitted patch.</para> + + <para>When this is done, go back to step 6 saying + the fallout was fixed and wait for the exp-run + to be run again. Repeat as long as there are + broken ports.</para> + </step> + </stepalternatives> </step> </procedure> </answer>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804171054.w3HAsa2s064616>