svn commit: r48460 - head/en_US.ISO8859-1/articles/committers-guide
Mathieu Arnold <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
Author: mat
Date: Wed Mar 23 15:28:38 2016
New Revision: 48460
URL: https://svnweb.freebsd.org/changeset/doc/48460
Log:
Add a small bit about the mfh script being able to handle multiple
revisions at once.
Reviewed by: wblock
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D5634
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 Wed Mar 23 13:28:41 2016 (r48459)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Mar 23 15:28:38 2016 (r48460)
@@ -4803,6 +4803,21 @@ Do you want to commit? (no = start a she
<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>
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"