From owner-svn-doc-all@FreeBSD.ORG  Fri Jan 25 14:27:48 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 954C3651;
 Fri, 25 Jan 2013 14:27:48 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 87955E22;
 Fri, 25 Jan 2013 14:27:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0PERmXU002595;
 Fri, 25 Jan 2013 14:27:48 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0PERmBx002594;
 Fri, 25 Jan 2013 14:27:48 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301251427.r0PERmBx002594@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 25 Jan 2013 14:27:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40746 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Jan 2013 14:27:48 -0000

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