Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

stgit: patch import with fuzz

From: Jon Smirl <hidden>
Date: 2016-06-15 22:44:08

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help