On Sun, Nov 15, 2009 at 01:05:11AM +0100, Miklos Vajna <[email protected]> wrote: > Applying: Fix overlapping problems in the api > error: patch failed: lib/libpacman/sha1.c:387 > error: lib/libpacman/sha1.c: patch does not apply > Patch failed at 0001 Fix overlapping problems in the api > When you have resolved this problem run "git am --resolved". > If you would prefer to skip this patch, instead run "git am --skip". > To restore the original branch and stop patching run "git am --abort".
Looks like --ignore-whitespace helps. How did you send such a patch using git-send-email? :) Applied anyway, thanks.
pgp95hyIQXU3o.pgp
Description: PGP signature
_______________________________________________ Frugalware-devel mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-devel
