I think it should be -p1, not -p0.
# bzcat 0.56.1-0.57.1.diff.bz2 | patch -p1

// Wigren

svndagen den 6 januari 2002 15.35 skrev du:
> > Imagine we have a /usr/local/src/xmame-0.56.2 directory.
> > put the patch in /usr/local/src, bunzip2 it, and type :
> > patch -p0 < 0.56.2-0.57.1.diff
>
> ah, so '-p0' is the magic option. It used to be that you just changed
> into the xmame source directory and did 'patch < difffile' as the
> diffs were in the same tree. do that now and it doesnt work. I also tried
> running thw patch from the directory above but that just left all the old
> and new files in my home directory ?!
>
> thiugh the above method doesnt work for me either...
>
> bash-2.05a$ patch -p0 < 0.56.1-0.57.1.diff
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
>
> |diff -Nur xmame-0.56.1/makefile.unix xmame-0.57.1/makefile.unix
> |--- xmame-0.56.1/makefile.unix Tue Nov 13 21:13:38 2001
> |+++ xmame-0.57.1/makefile.unix Sat Jan  5 19:43:18 2002
>
> --------------------------
> File to patch:
>
> is that because it is looking for the .56.1 directory despite being a .56.2
> patch ? So I tried renaming the directory tho get round that and got...
>
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
>
> |diff -Nur xmame-0.56.1/src/common.c xmame-0.57.1/src/common.c
> |--- xmame-0.56.1/src/common.c  Sun Nov  4 11:58:07 2001
> |+++ xmame-0.57.1/src/common.c  Tue Jan  1 19:45:51 2002
>
> --------------------------
> Patching file xmame-0.56.1/src/common.c using Plan A...
> Reversed (or previously applied) patch detected!  Assume -R? [y]
>
> I also tried just calling the directiry xmame-src and applying -p1
> but that gives much the same results as the renamed directory version...
>
> ???
>
> -bat. [eventually I just downloaded the whole tree like I usually do...]
> _______________________________________________
> Xmame mailing list
> [EMAIL PROTECTED]
> http://toybox.twisted.org.uk/mailman/listinfo/xmame
_______________________________________________
Xmame mailing list
[EMAIL PROTECTED]
http://toybox.twisted.org.uk/mailman/listinfo/xmame

Reply via email to