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

[Eitan Adler]

Author: eadler
Date: Fri Jan 25 14:27:47 2013
New Revision: 40746
URL: http://svnweb.freebsd.org/changeset/doc/40746

Log:
  Make it clear that reverts should contain mergeinfo.
  
  Discussed with:	brooks
  Approved by:	bcr (mentor)

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	Fri Jan 25 06:36:03 2013	(r40745)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Fri Jan 25 14:27:47 2013	(r40746)
@@ -1721,6 +1721,13 @@ U    stable/9/share/man/man4/netmap.4
 
 	<screen>&prompt.user; <userinput>svn merge -r179454:179453 svn+ssh://svn.freebsd.org/base/ROADMAP.txt</userinput></screen>
 
+	<note>
+	  <para>It is important to ensure that the mergeinfo
+	    is correct when reverting a file in order to permit
+	    <command>svn mergeinfo --eligible</command> to work as
+	    expected.</para>
+	</note>
+
 	<para>Reverting the deletion of a file is slightly different.
 	  Copying the version of the file that predates the deletion
 	  is required.  For example, to restore a file that was