svn commit: r45950 - head/en_US.ISO8859-1/books/porters-handbook/upgrading

[Mathieu Arnold]

Author: mat (ports committer)
Date: Fri Nov  7 22:02:59 2014
New Revision: 45950
URL: https://svnweb.freebsd.org/changeset/doc/45950

Log:
  Add a bit about adding, moving and copying files for patches.
  
  Differential Revision:	https://reviews.freebsd.org/D1052
  Reviewed by:	wblock
  Sponsored by:	Absolight

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml	Fri Nov  7 10:46:07 2014	(r45949)
+++ head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml	Fri Nov  7 22:02:59 2014	(r45950)
@@ -88,6 +88,13 @@
     sure to first clean out the work directories with
     <command>make clean</command>).</para>
 
+  <note>
+    <para>If some files have been added, copied, moved, or removed,
+      add this information to the problem report so that the committer
+      picking up the patch will know what &man.svn.1; commands to
+      run.</para>
+  </note>
+
   <para>To simplify common operations with patch files, use
     <command>make makepatch</command> as described in <xref
       linkend="slow-patch"/>.
@@ -181,10 +188,11 @@
     </calloutlist>
 
     <para>While in the port directory, make any changes that are
-      needed.  If adding, moving, or removing a
+      needed.  If adding, copying, moving, or removing a
       file, use <command>svn</command> to track these changes:</para>
 
     <screen>&prompt.user; <userinput>svn add <replaceable>new_file</replaceable></userinput>
+&prompt.user; <userinput>svn copy <replaceable>some_file</replaceable> <replaceable>file_copy</replaceable></userinput>
 &prompt.user; <userinput>svn move <replaceable>old_name</replaceable> <replaceable>new_name</replaceable></userinput>
 &prompt.user; <userinput>svn remove <replaceable>deleted_file</replaceable></userinput></screen>
 
@@ -253,9 +261,14 @@
     <screen>&prompt.user; <userinput>svn diff > ../`make -VPKGNAME`.diff</userinput></screen>
 
     <note>
-      <para>Any files that have been removed have to be explicitly
-	mentioned in the PR, because file removal may not be obvious
-	to the committer.</para>
+      <para>If files have been added, copied, moved, or removed,
+	include the &man.svn.1; <command>add</command>,
+	<command>copy</command>, <command>move</command>, and
+	<command>remove</command> commands that were used.
+	<command>svn move</command> or <command>svn copy</command>
+	must be run before the patch can be applied.  <command>svn
+	  add</command> or <command>svn remove</command> must be run
+	after the patch is applied.</para>
     </note>
 
     <para>Send the patch following the guidelines in