os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make it clear that reverts should contain mergeinfo.

Browse source 
Discussed with:	brooks
Approved by:	bcr (mentor)
This commit is contained in:
Eitan Adler 2013-01-25 14:27:47 +00:00
parent 83419cadd1
commit 0ef24a8970
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=40746
1 changed files with 7 additions and 0 deletions

7
en_US.ISO8859-1/articles/committers-guide/article.xml
View file

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