Date: Wed, 9 Mar 2005 20:28:17 +0100 From: Danny Koenig <lists-fbsd-ports@bsdberlin.org> To: Mark Foster <mark@foster.cc> Cc: ports@freebsd.org Subject: Re: finnicky patch Message-ID: <20050309202817.5d119bc0@tiberian.bsdberlin.local> In-Reply-To: <422F4B31.3070503@foster.cc> References: <422F4B31.3070503@foster.cc>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 09 Mar 2005 11:14:57 -0800 Mark Foster <mark@foster.cc> wrote: > Trying to prepare a patch to submit for updating cfengine2 to 2.1.13. > > I could use a little advice... as it doesn't apply clean to > cfengine2/Makefile and it doesn't create cfengine2/files/patch-item.c > although it say it is creating it. My understanding is that the -P > flag to diff so it will create the previously nonexistent > patch-item.c At my side there's no problem. See output: tiberian# patch < sysutils/patch-cfengine.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -Pur sysutils/cfengine2.orig/Makefile sysutils/cfengine2/Makefile |--- sysutils/cfengine2.orig/Makefile Fri Nov 12 06:08:36 2004 |+++ sysutils/cfengine2/Makefile Mon Mar 7 14:18:20 2005 -------------------------- Patching file sysutils/cfengine2/Makefile using Plan A... Hunk #1 failed at 6. 1 out of 1 hunks failed--saving rejects to sysutils/cfengine2/Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -Pur sysutils/cfengine2.orig/distinfo sysutils/cfengine2/distinfo |--- sysutils/cfengine2.orig/distinfo Fri Nov 12 06:08:36 2004 |+++ sysutils/cfengine2/distinfo Mon Mar 7 14:18:01 2005 -------------------------- Patching file sysutils/cfengine2/distinfo using Plan A... Hunk #1 succeeded at 1 with fuzz 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -Pur sysutils/cfengine2.orig/files/patch-item.c |sysutils/cfengine2/files/patch-item.c |--- sysutils/cfengine2.orig/files/patch-item.c Wed Dec 31 16:00:00 1969 |+++ sysutils/cfengine2/files/patch-item.c Mon Mar 7 14:19:23 2005 -------------------------- (Creating file sysutils/cfengine2/files/patch-item.c...) Patching file sysutils/cfengine2/files/patch-item.c using Plan A... Hunk #1 succeeded at 1. done tiberian# ls sysutils/cfengine2/files/ patch-contrib_Makefile.in patch-inputs_Makefile.in patch-item.c.orig patch-doc_Makefile.in patch-item.c tiberian#
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050309202817.5d119bc0>