Date: Sun, 9 Mar 2014 16:05:01 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r44196 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201403091605.s29G51eL030076@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Sun Mar 9 16:05:01 2014 New Revision: 44196 URL: http://svnweb.freebsd.org/changeset/doc/44196 Log: Make the text regarding the new merge policy for stable/10 less hard to miss. Submitted by: rwatson 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 Sun Mar 9 15:51:59 2014 (r44195) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Mar 9 16:05:01 2014 (r44196) @@ -1297,6 +1297,17 @@ You need a Passphrase to protect your se <title>Selecting the Source and Target for <literal>stable/9</literal> and Older</title> + <para>For <literal>stable/9</literal> and earlier, + a different strategy was used, distributing mergeinfo + around the tree so that merges could be performed without + a complete checkout. This procedure proved extremely + error-prone, with the convenience of partial checkouts for + merges significantly outweighed by the complexity of + picking mergeinfo targets. The below describes this + now-obsoleted procedure, which should be used + <emphasis>only for merges prior to + <literal>stable/10</literal></emphasis>.</para> + <para>Because of mergeinfo propagation, it is important to choose the source and target for the merge carefully to minimise property changes on unrelated directories.</para>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403091605.s29G51eL030076>