Date: Mon, 1 May 2017 09:25:22 +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: r50218 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201705010925.v419PMnw070279@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon May 1 09:25:22 2017 New Revision: 50218 URL: https://svnweb.freebsd.org/changeset/doc/50218 Log: Expand a bit the usage of the quarterly branch in the mfh command line. 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 May 1 09:25:19 2017 (r50217) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon May 1 09:25:22 2017 (r50218) @@ -4597,10 +4597,13 @@ Do you want to commit? (no = start a she <note> <para>The mfh script can also take an optional first argument, the branch where the merge is being done. - It does, however, select the latest branch, so - specifying the branch is discouraged.</para> + Only the latest quarterly branch is supported, so + specifying the branch is discouraged. To be safe, the + script will give a warning if the quarterly branch is + not the latest:</para> - <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713</userinput></screen> + <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713</userinput> +/!\ The latest branch is 2016Q2, do you really want to commit to 2016Q1? [y/n]</screen> </note> </answer> </qandaentry>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705010925.v419PMnw070279>