Date: Mon, 27 Jun 2005 19:58:07 GMT From: Woody Carey <woodycarey@hotmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: docs/82705: [PATCH] porters handbook - 4.6 patching - add note for context lines >=3 Message-ID: <200506271958.j5RJw70T094745@www.freebsd.org> Resent-Message-ID: <200506272000.j5RK0aq5015023@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506271958.j5RJw70T094745>