stgit: patch import with fuzz
- From
Jon Smirl <jonsmirl@gmail.com>
- Date
- Jan 25, 2008, 03:01 UTC
- Message-ID
- <9e4733910801241901t230898d2t90ce2a14152e1af1@mail.gmail.com>
Is there a way to allow a patch import with fuzz?
jonsmirl@terra:~/ds$ stg import patches-i2c/jds-mpc-i2c-to-of Checking for changes in the working directory ... done Importing patch "jds-mpc-i2c-to-of" ... error: patch failed: arch/powerpc/sysdev/fsl_soc.c:318 error: arch/powerpc/sysdev/fsl_soc.c: patch does not apply Warning: Diff written to the .stgit-failed.patch file stg import: git failed with code 1
Import it manually....
jonsmirl@terra:~/ds$ patch -p1 <patches-i2c/jds-mpc-i2c-to-of patching file arch/powerpc/sysdev/fsl_soc.c Hunk #1 succeeded at 320 with fuzz 2 (offset 2 lines). patching file drivers/i2c/busses/Makefile patching file drivers/i2c/busses/i2c-mpc-drv.c patching file drivers/i2c/busses/powerpc-common.c patching file drivers/i2c/busses/powerpc-common.h patching file include/linux/mod_devicetable.h jonsmirl@terra:~/ds$
-- Jon Smirl jonsmirl@gmail.com