Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Dec 2013 09:04:06 -0700 (MST)
From:      Warren Block <wblock@wonkity.com>
To:        Glen Barber <gjb@FreeBSD.org>
Cc:        svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, doc-committers@freebsd.org
Subject:   Re: svn commit: r43315 - head/en_US.ISO8859-1/articles/committers-guide
Message-ID:  <alpine.BSF.2.00.1312090902490.78161@wonkity.com>
In-Reply-To: <201312091537.rB9FbU89065095@svn.freebsd.org>
References:  <201312091537.rB9FbU89065095@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 9 Dec 2013, Glen Barber wrote:

> 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>

Maybe that would be a little clearer with s/be merged/originate/ ?

> +
> +	  <screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>10</replaceable> releng/<replaceable>10.0</replaceable>
> 	</sect4>
>
> 	<sect4 xml:id="oldmerge">
>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1312090902490.78161>