From owner-freebsd-doc@FreeBSD.ORG Mon Jun 27 20:00:36 2005 Return-Path: X-Original-To: freebsd-doc@hub.freebsd.org Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC85616A41F for ; Mon, 27 Jun 2005 20:00:36 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2CE643D53 for ; Mon, 27 Jun 2005 20:00:36 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5RK0a73015030 for ; Mon, 27 Jun 2005 20:00:36 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5RK0aq5015023; Mon, 27 Jun 2005 20:00:36 GMT (envelope-from gnats) Resent-Date: Mon, 27 Jun 2005 20:00:36 GMT Resent-Message-Id: <200506272000.j5RK0aq5015023@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, Woody Carey Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF11616A41C for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: docs/82705: [PATCH] porters handbook - 4.6 patching - add note for context lines >=3 X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jun 2005 20:00:37 -0000 >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: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jun 27 20:00:36 GMT 2005 >Closed-Date: >Last-Modified: >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: >Unformatted: