Date: Thu, 19 Jul 2012 22:01:01 +0200 (CEST) From: Beat Gaetzi <beat@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: docs/170006: [PATCH] [porters-handbook] Remove obsolete svn diff option Message-ID: <201207192001.q6JK11gA029524@tinderbox.chruetertee.ch> Resent-Message-ID: <201207192010.q6JKABXj004420@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170006
>Category: docs
>Synopsis: [PATCH] [porters-handbook] Remove obsolete svn diff option
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-doc
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 19 20:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Beat Gätzi
>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 > ../`basename ${PWD}`.diff</userinput></screen>
+ <screen>&prompt.user; <userinput>svn diff > ../`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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207192001.q6JK11gA029524>