stgit: patch import with fuzz

stgit: patch import with fuzz

[Jon Smirl]

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

Re: stgit: patch import with fuzz

[Karl Hasselström]

On 2008-01-24 22:01:37 -0500, Jon Smirl wrote:

> Is there a way to allow a patch import with fuzz?

Not currently. And it appears that git doesn't have this power either
-- and I guess if it's useful in StGit, its useful in git too, so I'm
not too keen on making StGit call "patch" or some such instead of
teaching git to do this. Then again, it'd be useful, and I doubt I'd
get around to teaching fuzz to git-apply any time soon ...

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: stgit: patch import with fuzz

[Jakub Narebski]

Karl Hasselström <kha@treskal.com> writes:

> On 2008-01-24 22:01:37 -0500, Jon Smirl wrote:
> 
> > Is there a way to allow a patch import with fuzz?
> 
> Not currently. And it appears that git doesn't have this power either

"git apply -C1 <patch>" doesn't do that Well, that isn't import per se)? 

-- 
Jakub Narebski
Poland
ShadeHawk on #git