os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Note the branch name as the first argument of mfh is obsolete.

Browse source 
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2017-01-03 18:39:02 +00:00
parent f74182e933
commit f798724859
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=49792
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
en_US.ISO8859-1/articles/committers-guide/article.xml
View file

@ -4739,7 +4739,7 @@ Relnotes: yes</programlisting>
commit: <filename>ports/Tools/scripts/mfh</filename>.
It is used as follows:</para>
<screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2015Q1 380362</userinput>
<screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 380362</userinput>
U 2015Q1
Checked out revision 380443.
A 2015Q1/security
@ -4825,8 +4825,17 @@ Do you want to commit? (no = start a shell) [y/n]</screen>
messages must be edited to show what is actually being
done with the new commit.</para>
<screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713 r407722 r408567 r408943 r410728</userinput></screen>
<screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh r407208 r407713 r407722 r408567 r408943 r410728</userinput></screen>
</tip>
<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 discourraged.</para>
<screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713</userinput></screen>
</note>
</answer>
</qandaentry>