Date: Sun, 11 Nov 2007 16:02:51 +0100 From: Matthias Apitz <m.apitz@oclcpica.org> To: freebsd-questions@freebsd.org Subject: problems with building a patch Message-ID: <20071111150251.GA15448@rebelion.Sisis.de>
next in thread | raw e-mail | index | archive | help
Hello, I've build a patch for 'nn-6.7.3' to add support for RFC1522 to my beloved news-reader. Before giving it away I was trying it on a fresh workspace of the /usr/ports/news/nn and run into the problem that new files which brings the patch to the tree are always created in the current working dir, even if I create them before with touch(1), existing files, like 'answer.c' in the example below, get patched correctly: $ /usr/ports/news/nn/work $ touch nn-6.7.3/PATCH.RFC1522 $ patch < ../myRFC1522.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -N -r -u -X exclude nn-6.7.3/PATCH.RFC1522 nn-6.7.3.patched/PATCH.RFC1522 |--- nn-6.7.3/PATCH.RFC1522 Thu Jan 1 01:00:00 1970 |+++ nn-6.7.3.patched/PATCH.RFC1522 Sat Nov 10 11:04:58 2007 -------------------------- (Creating file PATCH.RFC1522...) Patching file PATCH.RFC1522 using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -N -r -u -X exclude nn-6.7.3/answer.c nn-6.7.3.patched/answer.c |--- nn-6.7.3/answer.c Wed Mar 30 21:28:22 2005 |+++ nn-6.7.3.patched/answer.c Fri Nov 9 12:58:26 2007 -------------------------- Patching file nn-6.7.3/answer.c using Plan A... Hunk #1 succeeded at 30. Hunk #2 succeeded at 155. Hunk #3 succeeded at 166. Hunk #4 succeeded at 278. Hunk #5 succeeded at 291. Hunk #6 succeeded at 458. Hunk #7 succeeded at 487. Hunk #8 succeeded at 690. Hunk #9 succeeded at 1017. done $ ls -l total 10 -rw-r--r-- 1 guru wheel 5342 11 nov 15:39 PATCH.RFC1522 -rw-r--r-- 1 guru wheel 0 11 nov 15:39 PATCH.RFC1522.orig drwxr-xr-x 6 guru wheel 4096 11 nov 15:39 nn-6.7.3 $ ls -l nn-6.7.3/answer.c* -rw-r--r-- 1 guru wheel 23903 11 nov 15:39 nn-6.7.3/answer.c -rw-r--r-- 1 guru wheel 22625 30 mar 2005 nn-6.7.3/answer.c.orig What is the reason for this? I'm a bit lost :-( Thx matthias -- Matthias Apitz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071111150251.GA15448>