Bug 170006

Summary:

[PATCH] [porters-handbook] Remove obsolete svn diff option

Product:

Documentation

Reporter:

Beat Gaetzi <beat>

Component:

Books & Articles

Assignee:

Warren Block <wblock>

Status:

Closed FIXED

Severity:

Affects Only Me

Priority:

Normal

Version:

Latest

Hardware:

Any

OS:

Any

Attachments:

Description	Flags
porters-handbook-diff.patch	none

Description Beat Gaetzi freebsd_committer

2012-07-19 21:10:10 UTC

	The example how to create a diff has the -N option set although
	this option is obsolete. Attached patch removes the -N from the
	example. This was reported by:
	Christoph Moench-Tegeder <cmt AT burggraben.net>

Comment 1 Warren Block freebsd_committer

2012-07-19 21:17:16 UTC

Responsible Changed
From-To: freebsd-doc->wblock

Take.

Comment 2 Warren Block freebsd_committer

2012-07-22 22:51:41 UTC

State Changed
From-To: open->closed

Modified version of patch committed.  Thanks!

Comment 3 dfilter service freebsd_committer

2012-07-22 22:51:41 UTC

Author: wblock
Date: Sun Jul 22 21:51:27 2012
New Revision: 39245
URL: http://svn.freebsd.org/changeset/doc/39245

Log:
  Remove obsolete svn diff option.
  
  PR:		170006
  Submitted by:	beat@freebsd.org

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/book.sgml

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Sun Jul 22 16:43:08 2012	(r39244)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Sun Jul 22 21:51:27 2012	(r39245)
@@ -10371,15 +10371,12 @@ as .putsy.conf and edit it.</programlist
       <para>The last step is to make a unified &man.diff.1;
 	of the files against SVN:</para>
 
-      <screen>&prompt.user; <userinput>svn diff -N &gt; ../`basename ${PWD}`.diff</userinput></screen>
+      <screen>&prompt.user; <userinput>svn diff &gt; ../`basename ${PWD}`.diff</userinput></screen>
 
       <note>
-	<para>It is important to use <option>-N</option> to ensure
-	  that files you have added or removed are accounted for in
-	  the patch.  The patch will include any removed files when
-	  applied, though the file contents will be empty, so remember
-	  to include these in the PR so the committer knows to remove
-	  them.</para>
+	<para>Any files that have been removed should be explicitly
+	  mentioned in the PR, because file removal may not be obvious
+	  to the committer.</para>
       </note>
 
       <para>Send your patch following the guidelines in
_______________________________________________
svn-doc-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "svn-doc-all-unsubscribe@freebsd.org"