Author: julianfoad
Date: Fri Apr 11 12:58:26 2014
New Revision: 1586638
URL: http://svn.apache.org/r1586638
Log:
* svn-best-practices.html
(Track merges manually): Mark this recommendation as obsolete.
Modified:
subversion/trunk/doc/user/svn-best-practices.html
Modified: subversion/trunk/doc/user/svn-best-practices.html
URL:
http://svn.apache.org/viewvc/subversion/trunk/doc/user/svn-best-practices.html?rev=1586638&r1=1586637&r2=1586638&view=diff
==============================================================================
--- subversion/trunk/doc/user/svn-best-practices.html (original)
+++ subversion/trunk/doc/user/svn-best-practices.html Fri Apr 11 12:58:26 2014
@@ -89,8 +89,11 @@ and your issue-tracking database as poss
<!-- =================================================== -->
+<div style="color:grey">
<h2>Track merges manually</h2>
+<p><em>### OBSOLETE RECOMMENDATION ###</em></p>
+
<p>When committing the result of a merge, be sure to write a
descriptive log message that explains what was merged, something
like:</p>
@@ -101,6 +104,7 @@ like:</p>
href="http://svnbook.red-bean.com/svnbook/ch04s03.html#svn-ch-4-sect-3.2";>Tracking
merges manually</a>, and <a
href="http://svnbook.red-bean.com/svnbook/ch04s04.html#svn-ch-4-sect-4.1";>Merging
a whole branch to another</a>.</p>
+</div>
<!-- =================================================== -->
