svn commit: r43315 - head/en_US.ISO8859-1/articles/committers-guide

Glen Barber gjb at FreeBSD.org
Mon Dec 9 15:37:31 UTC 2013


Author: gjb
Date: Mon Dec  9 15:37:30 2013
New Revision: 43315
URL: http://svnweb.freebsd.org/changeset/doc/43315

Log:
  Make it clear that merges to releng/N.M branches should originate from
  the corresponding stable/N branch.
  
  Reviewed by:	gavin
  Sponsored by:	The FreeBSD Foundation

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 Dec  9 15:14:01 2013	(r43314)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon Dec  9 15:37:30 2013	(r43315)
@@ -1133,6 +1133,12 @@
 	  <para>Note that <replaceable>checkout</replaceable> should
 	    be a complete checkout of the branch to which the merge
 	    occurs.</para>
+
+	  <para>Merges to <literal>releng/</literal> branches should
+	    always be merged from the corresponding
+	    <literal>stable/</literal> branch.  For example:</para>
+
+	  <screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>10</replaceable> releng/<replaceable>10.0</replaceable>
 	</sect4>
 
 	<sect4 xml:id="oldmerge">


More information about the svn-doc-all mailing list