From nobody@FreeBSD.org  Mon Jun 27 19:58:07 2005
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AF11616A41C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Jun 2005 19:58:07 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 99B0843D1D
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Jun 2005 19:58:07 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j5RJw7VD094748
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Jun 2005 19:58:07 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id j5RJw70T094745;
	Mon, 27 Jun 2005 19:58:07 GMT
	(envelope-from nobody)
Message-Id: <200506271958.j5RJw70T094745@www.freebsd.org>
Date: Mon, 27 Jun 2005 19:58:07 GMT
From: Woody Carey <woodycarey@hotmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] porters handbook - 4.6 patching - add note for context lines >=3
X-Send-Pr-Version: www-2.3

>Number:         82705
>Category:       docs
>Synopsis:       [PATCH] porters handbook - 4.6 patching - add note for context lines >=3
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 27 20:00:36 GMT 2005
>Closed-Date:    Fri Jul 15 19:50:16 GMT 2005
>Last-Modified:  Fri Jul 15 19:50:16 GMT 2005
>Originator:     Woody Carey
>Release:        5.4-Stable
>Organization:
>Environment:
FreeBSD adsl-67-112-113-90.dsl.pltn13.pacbell.net 5.4-STABLE FreeBSD 5.4-STABLE #0: Mon Jun 13 13:36:59 PDT 2005     wcarey@adsl-67-112-113-90.dsl.pltn13.pacbell.net:/usr/obj/usr/src/sys/SPANKY  i386

>Description:

I would recommend adding a paragraph to   http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/slow-patch.html

which mentions that in order to get 'patch' to *not* prompt for file to patch, you should specify at least 3 or four lines of context for context or unified context diffs when diffing:

diff -C 4 foo.c.original foo.c > patch-foo.c
diff -U 4 foo.c.original foo.c >patch-foo.c
>How-To-Repeat:
Try to be a new porter and have this bite you!
>Fix:
Add paragraph:

In order to get patch to run non-interactively, you should create your patches with more lines of context than the default:

diff -C 4 foo.c.original foo.c > patch-foo.c
diff -U 4 foo.c.original foo.c >patch-foo.c

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Thu Jul 14 23:43:42 GMT 2005 
State-Changed-Why:  
This looks bogus to me - it will never prompt if you generate the patch 
from the WRKDIR directory, and it will prompt every time if you generate it 
from elsewhere. Amount of context lines have nothing to do with this. 

Or not? 


Responsible-Changed-From-To: freebsd-doc->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Thu Jul 14 23:43:42 GMT 2005 
Responsible-Changed-Why:  
Poke 

http://www.freebsd.org/cgi/query-pr.cgi?pr=82705 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Fri Jul 15 19:50:01 GMT 2005 
State-Changed-Why:  
Reached an agreement with a submitter to close this PR without action. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=82705 
>Unformatted:
