From beat@tinderbox.chruetertee.ch  Thu Jul 19 20:01:10 2012
Return-Path: <beat@tinderbox.chruetertee.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7715A1065673
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 19 Jul 2012 20:01:10 +0000 (UTC)
	(envelope-from beat@tinderbox.chruetertee.ch)
Received: from tinderbox.chruetertee.ch (cl-104.gva-01.ch.sixxs.net [IPv6:2a02:2528:ff00:67::2])
	by mx1.freebsd.org (Postfix) with ESMTP id DBCFE8FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 19 Jul 2012 20:01:09 +0000 (UTC)
Received: from tinderbox.chruetertee.ch (localhost [127.0.0.1])
	by tinderbox.chruetertee.ch (8.14.5/8.14.5) with ESMTP id q6JK16Mf029564
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 19 Jul 2012 22:01:07 +0200 (CEST)
	(envelope-from beat@tinderbox.chruetertee.ch)
Received: (from beat@localhost)
	by tinderbox.chruetertee.ch (8.14.5/8.14.5/Submit) id q6JK11gA029524;
	Thu, 19 Jul 2012 22:01:01 +0200 (CEST)
	(envelope-from beat)
Message-Id: <201207192001.q6JK11gA029524@tinderbox.chruetertee.ch>
Date: Thu, 19 Jul 2012 22:01:01 +0200 (CEST)
From: Beat Gaetzi <beat@freebsd.org>
Reply-To: Beat Gaetzi <beat@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] [porters-handbook] Remove obsolete svn diff option
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170006
>Category:       docs
>Synopsis:       [PATCH] [porters-handbook] Remove obsolete svn diff option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wblock
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 19 20:10:10 UTC 2012
>Closed-Date:    Sun Jul 22 21:52:05 UTC 2012
>Last-Modified:  Sun Jul 22 22:00:20 UTC 2012
>Originator:     Beat Gtzi
>Release:        FreeBSD 10.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD tinderbox.chruetertee.ch 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r237414M: Fri Jun 22 10:55:48 CEST 2012 root@tinderbox.chruetertee.ch:/usr/obj/usr/home/beat/dev/src/head/sys/BEASTIE i386


	
>Description:
	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>

	
>How-To-Repeat:
	
>Fix:

	

--- porters-handbook-diff.patch begins here ---
Index: en_US.ISO8859-1/books/porters-handbook/book.sgml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/book.sgml	(Revision 39236)
+++ en_US.ISO8859-1/books/porters-handbook/book.sgml	(Arbeitskopie)
@@ -10371,14 +10371,12 @@
       <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
+	<para>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>
       </note>
 
--- porters-handbook-diff.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->wblock 
Responsible-Changed-By: wblock 
Responsible-Changed-When: Thu Jul 19 20:17:16 UTC 2012 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170006 
State-Changed-From-To: open->closed 
State-Changed-By: wblock 
State-Changed-When: Sun Jul 22 21:51:41 UTC 2012 
State-Changed-Why:  
Modified version of patch committed.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170006 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/170006: commit references a PR
Date: Sun, 22 Jul 2012 21:51:41 +0000 (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"
 
>Unformatted:
