From owner-freebsd-doc@FreeBSD.ORG Thu Jul 19 20:10:11 2012 Return-Path: Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 853D51065673 for ; Thu, 19 Jul 2012 20:10:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4EE7D8FC12 for ; Thu, 19 Jul 2012 20:10:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6JKABOK004421 for ; Thu, 19 Jul 2012 20:10:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6JKABXj004420; Thu, 19 Jul 2012 20:10:11 GMT (envelope-from gnats) Resent-Date: Thu, 19 Jul 2012 20:10:11 GMT Resent-Message-Id: <201207192010.q6JKABXj004420@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Beat Gaetzi Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7715A1065673 for ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: docs/170006: [PATCH] [porters-handbook] Remove obsolete svn diff option X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Beat Gaetzi List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jul 2012 20:10:11 -0000 >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 >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 @@ The last step is to make a unified &man.diff.1; of the files against SVN: - &prompt.user; svn diff -N > ../`basename ${PWD}`.diff + &prompt.user; svn diff > ../`basename ${PWD}`.diff - It is important to use 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 + 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. --- porters-handbook-diff.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: