diff --git a/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml index 0933d1f1ed..609a8127cd 100644 --- a/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml @@ -88,6 +88,13 @@ sure to first clean out the work directories with make clean). + + 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. + + To simplify common operations with patch files, use make makepatch as described in . @@ -181,10 +188,11 @@ 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 svn to track these changes: &prompt.user; svn add new_file +&prompt.user; svn copy some_file file_copy &prompt.user; svn move old_name new_name &prompt.user; svn remove deleted_file @@ -253,9 +261,14 @@ &prompt.user; svn diff > ../`make -VPKGNAME`.diff - Any files that have been removed have to be explicitly - mentioned in the PR, because file removal may not be obvious - to the committer. + If files have been added, copied, moved, or removed, + include the &man.svn.1; add, + copy, move, and + remove commands that were used. + svn move or svn copy + must be run before the patch can be applied. svn + add or svn remove must be run + after the patch is applied. Send the patch following the guidelines in