svn commit: r49793 - 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: Tue Jan 3 18:42:44 2017
New Revision: 49793
URL: https://svnweb.freebsd.org/changeset/doc/49793
Log:
Move the procedure to merge to the quarterly branch to a separate
section.
It will, maybe, be easier to find there.
No content change, except for the new title of the section.
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 Tue Jan 3 18:39:02 2017 (r49792)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Jan 3 18:42:44 2017 (r49793)
@@ -4433,6 +4433,135 @@ Relnotes: yes</programlisting>
</qandaentry>
</qandadiv>
+ <qandadiv xml:id="ports-qa-quarterly">
+ <title>Quarterly branches</title>
+
+ <qandaentry xml:id="ports-qa-misc-request-mfh">
+ <question>
+ <para>What is the procedure to request authorization for
+ merging a commit to the quarterly branch?</para>
+ </question>
+
+ <answer>
+ <para>When doing the commit, add the branch name to the
+ <literal>MFH:</literal> line, for example:</para>
+
+ <programlisting>MFH: <replaceable>2014Q1</replaceable></programlisting>
+
+ <para>It will automatically notify the &a.ports-secteam; and
+ the &a.portmgr;. They will then decide if the commit can be
+ merged and answer with the procedure.</para>
+
+ <para>If the commit has already been made, send an email
+ to the &a.ports-secteam; and the &a.portmgr; with the revision
+ number and a small description of why the commit needs
+ to be merged.</para>
+
+ <para>A script is provided to automate merging a specific
+ commit: <filename>ports/Tools/scripts/mfh</filename>.
+ It is used as follows:</para>
+
+ <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 380362</userinput>
+ U 2015Q1
+Checked out revision 380443.
+A 2015Q1/security
+Updating '2015Q1/security/rubygem-sshkit':
+A 2015Q1/security/rubygem-sshkit
+A 2015Q1/security/rubygem-sshkit/Makefile
+A 2015Q1/security/rubygem-sshkit/distinfo
+A 2015Q1/security/rubygem-sshkit/pkg-descr
+Updated to revision 380443.
+--- Merging r380362 into '2015Q1':
+U 2015Q1/security/rubygem-sshkit/Makefile
+U 2015Q1/security/rubygem-sshkit/distinfo
+--- Recording mergeinfo for merge of r380362 into '2015Q1':
+ U 2015Q1
+--- Recording mergeinfo for merge of r380362 into '2015Q1/security':
+ G 2015Q1/security
+--- Eliding mergeinfo from '2015Q1/security':
+ U 2015Q1/security
+--- Recording mergeinfo for merge of r380362 into '2015Q1/security/rubygem-sshkit':
+ G 2015Q1/security/rubygem-sshkit
+--- Eliding mergeinfo from '2015Q1/security/rubygem-sshkit':
+ U 2015Q1/security/rubygem-sshkit
+ M 2015Q1
+M 2015Q1/security/rubygem-sshkit/Makefile
+M 2015Q1/security/rubygem-sshkit/distinfo
+Index: 2015Q1/security/rubygem-sshkit/Makefile
+===================================================================
+--- 2015Q1/security/rubygem-sshkit/Makefile (revision 380443)
++++ 2015Q1/security/rubygem-sshkit/Makefile (working copy)
+@@ -2,7 +2,7 @@
+ # $FreeBSD$
+
+ PORTNAME= sshkit
+-PORTVERSION= 1.6.1
++PORTVERSION= 1.7.0
+ CATEGORIES= security rubygems
+ MASTER_SITES= RG
+
+Index: 2015Q1/security/rubygem-sshkit/distinfo
+===================================================================
+--- 2015Q1/security/rubygem-sshkit/distinfo (revision 380443)
++++ 2015Q1/security/rubygem-sshkit/distinfo (working copy)
+@@ -1,2 +1,2 @@
+-SHA256 (rubygem/sshkit-1.6.1.gem) = 8ca67e46bb4ea50fdb0553cda77552f3e41b17a5aa919877d93875dfa22c03a7
+-SIZE (rubygem/sshkit-1.6.1.gem) = 135680
++SHA256 (rubygem/sshkit-1.7.0.gem) = 90effd1813363bae7355f4a45ebc8335a8ca74acc8d0933ba6ee6d40f281a2cf
++SIZE (rubygem/sshkit-1.7.0.gem) = 136192
+Index: 2015Q1
+===================================================================
+--- 2015Q1 (revision 380443)
++++ 2015Q1 (working copy)
+
+Property changes on: 2015Q1
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /head:r380362
+Do you want to commit? (no = start a shell) [y/n]</screen>
+
+ <para>At that point, the script will either open a shell
+ for you to fix things, or open your text editor with the
+ commit message all prepared and then commit the
+ merge.</para>
+
+ <para>The script assumes that you can connect to
+ <literal>repo.FreeBSD.org</literal> with
+ <application>SSH</application> directly, so if your
+ local login name is different than your &os; cluster
+ account, you need a few lines in your
+ <filename>~/.ssh/config</filename>:</para>
+
+ <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 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>
+ </qandadiv>
+
<qandadiv xml:id="ports-qa-new-category">
<title>Creating a New Category</title>
@@ -4714,130 +4843,6 @@ Relnotes: yes</programlisting>
</answer>
</qandaentry>
- <qandaentry xml:id="ports-qa-misc-request-mfh">
- <question>
- <para>What is the procedure to request authorization for
- merging a commit to the quarterly branch?</para>
- </question>
-
- <answer>
- <para>When doing the commit, add the branch name to the
- <literal>MFH:</literal> line, for example:</para>
-
- <programlisting>MFH: <replaceable>2014Q1</replaceable></programlisting>
-
- <para>It will automatically notify the &a.ports-secteam; and
- the &a.portmgr;. They will then decide if the commit can be
- merged and answer with the procedure.</para>
-
- <para>If the commit has already been made, send an email
- to the &a.ports-secteam; and the &a.portmgr; with the revision
- number and a small description of why the commit needs
- to be merged.</para>
-
- <para>A script is provided to automate merging a specific
- commit: <filename>ports/Tools/scripts/mfh</filename>.
- It is used as follows:</para>
-
- <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 380362</userinput>
- U 2015Q1
-Checked out revision 380443.
-A 2015Q1/security
-Updating '2015Q1/security/rubygem-sshkit':
-A 2015Q1/security/rubygem-sshkit
-A 2015Q1/security/rubygem-sshkit/Makefile
-A 2015Q1/security/rubygem-sshkit/distinfo
-A 2015Q1/security/rubygem-sshkit/pkg-descr
-Updated to revision 380443.
---- Merging r380362 into '2015Q1':
-U 2015Q1/security/rubygem-sshkit/Makefile
-U 2015Q1/security/rubygem-sshkit/distinfo
---- Recording mergeinfo for merge of r380362 into '2015Q1':
- U 2015Q1
---- Recording mergeinfo for merge of r380362 into '2015Q1/security':
- G 2015Q1/security
---- Eliding mergeinfo from '2015Q1/security':
- U 2015Q1/security
---- Recording mergeinfo for merge of r380362 into '2015Q1/security/rubygem-sshkit':
- G 2015Q1/security/rubygem-sshkit
---- Eliding mergeinfo from '2015Q1/security/rubygem-sshkit':
- U 2015Q1/security/rubygem-sshkit
- M 2015Q1
-M 2015Q1/security/rubygem-sshkit/Makefile
-M 2015Q1/security/rubygem-sshkit/distinfo
-Index: 2015Q1/security/rubygem-sshkit/Makefile
-===================================================================
---- 2015Q1/security/rubygem-sshkit/Makefile (revision 380443)
-+++ 2015Q1/security/rubygem-sshkit/Makefile (working copy)
-@@ -2,7 +2,7 @@
- # $FreeBSD$
-
- PORTNAME= sshkit
--PORTVERSION= 1.6.1
-+PORTVERSION= 1.7.0
- CATEGORIES= security rubygems
- MASTER_SITES= RG
-
-Index: 2015Q1/security/rubygem-sshkit/distinfo
-===================================================================
---- 2015Q1/security/rubygem-sshkit/distinfo (revision 380443)
-+++ 2015Q1/security/rubygem-sshkit/distinfo (working copy)
-@@ -1,2 +1,2 @@
--SHA256 (rubygem/sshkit-1.6.1.gem) = 8ca67e46bb4ea50fdb0553cda77552f3e41b17a5aa919877d93875dfa22c03a7
--SIZE (rubygem/sshkit-1.6.1.gem) = 135680
-+SHA256 (rubygem/sshkit-1.7.0.gem) = 90effd1813363bae7355f4a45ebc8335a8ca74acc8d0933ba6ee6d40f281a2cf
-+SIZE (rubygem/sshkit-1.7.0.gem) = 136192
-Index: 2015Q1
-===================================================================
---- 2015Q1 (revision 380443)
-+++ 2015Q1 (working copy)
-
-Property changes on: 2015Q1
-___________________________________________________________________
-Modified: svn:mergeinfo
- Merged /head:r380362
-Do you want to commit? (no = start a shell) [y/n]</screen>
-
- <para>At that point, the script will either open a shell
- for you to fix things, or open your text editor with the
- commit message all prepared and then commit the
- merge.</para>
-
- <para>The script assumes that you can connect to
- <literal>repo.FreeBSD.org</literal> with
- <application>SSH</application> directly, so if your
- local login name is different than your &os; cluster
- account, you need a few lines in your
- <filename>~/.ssh/config</filename>:</para>
-
- <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 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>
<qandaentry xml:id="ports-exp-run">
<question>
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"