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

Add a bit about adding, moving and copying files for patches.

Browse source 
Differential Revision:	https://reviews.freebsd.org/D1052
Reviewed by:	wblock
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2014-11-07 22:02:59 +00:00
parent 3c2b52874e
commit df56018912
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=45950
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
View file

@ -88,6 +88,13 @@
sure to first clean out the work directories with sure to first clean out the work directories with
<command>make clean</command>).</para> <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 <para>To simplify common operations with patch files, use
<command>make makepatch</command> as described in <xref <command>make makepatch</command> as described in <xref
linkend="slow-patch"/>. linkend="slow-patch"/>.
@ -181,10 +188,11 @@
</calloutlist> </calloutlist>
<para>While in the port directory, make any changes that are <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> file, use <command>svn</command> to track these changes:</para>
<screen>&prompt.user; <userinput>svn add <replaceable>new_file</replaceable></userinput> <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 move <replaceable>old_name</replaceable> <replaceable>new_name</replaceable></userinput>
&prompt.user; <userinput>svn remove <replaceable>deleted_file</replaceable></userinput></screen> &prompt.user; <userinput>svn remove <replaceable>deleted_file</replaceable></userinput></screen>
@ -253,9 +261,14 @@
<screen>&prompt.user; <userinput>svn diff &gt; ../`make -VPKGNAME`.diff</userinput></screen> <screen>&prompt.user; <userinput>svn diff &gt; ../`make -VPKGNAME`.diff</userinput></screen>
<note> <note>
<para>Any files that have been removed have to be explicitly <para>If files have been added, copied, moved, or removed,
mentioned in the PR, because file removal may not be obvious include the &man.svn.1; <command>add</command>,
to the committer.</para> <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> </note>
<para>Send the patch following the guidelines in <para>Send the patch following the guidelines in