From owner-svn-doc-all@FreeBSD.ORG Fri Nov 7 22:02:59 2014 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6FE496B; Fri, 7 Nov 2014 22:02:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B8A8F29B; Fri, 7 Nov 2014 22:02:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA7M2xvP081678; Fri, 7 Nov 2014 22:02:59 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA7M2x1M081677; Fri, 7 Nov 2014 22:02:59 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201411072202.sA7M2x1M081677@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 7 Nov 2014 22:02:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r45950 - head/en_US.ISO8859-1/books/porters-handbook/upgrading 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.18-1 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 22:03:00 -0000 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 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