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

Add a small bit about the mfh script being able to handle multiple

Browse source 
revisions at once.

Reviewed by:	wblock
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D5634
This commit is contained in:
Mathieu Arnold 2016-03-23 15:28:38 +00:00
parent 6744c0db1b
commit 31b1c079e9
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=48460
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4803,6 +4803,21 @@ Do you want to commit? (no = start a shell) [y/n]</screen>
<programlisting>Host repo.freebsd.org # Can be *.freebsd.org
User <replaceable>freebsd-login</replaceable></programlisting>
<tip>
<para>The script is also able to merge more than one
revision at a time. If there have been other updates
to the port since the branch was created that have not
been merged because they were not security related.
Add the different revisions in the order they were
committed on the <command>mfh</command> command line.
The new commit log message will contain the combined
log messages from all the original commits. These
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>
</tip>
</answer>
</qandaentry>
</qandadiv>