{"thread":{"id":"11728","subject":"stgit: patch import with fuzz","startedAt":"2008-01-25T03:01:37Z","lastAt":"2008-01-25T10:00:22Z","messageCount":3,"participants":["Jon Smirl","Karl Hasselström","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"66532","messageId":"9e4733910801241901t230898d2t90ce2a14152e1af1@mail.gmail.com","threadId":"11728","inReplyTo":null,"subject":"stgit: patch import with fuzz","fromName":"Jon Smirl","fromEmail":"jonsmirl@gmail.com","sentAt":"2008-01-25T03:01:37Z","receivedAt":"2008-01-25T03:01:37Z","isPatch":false,"sender":{"key":"jonsmirl@gmail.com","avatar":"https://gravatar.com/avatar/cff3bf5bfdfa6708b905712ff91f0f9b8aaca161659f38c02b787920d5d28b7e?d=mp&s=160"},"body":"Is there a way to allow a patch import with fuzz?\n\njonsmirl@terra:~/ds$ stg import patches-i2c/jds-mpc-i2c-to-of\nChecking for changes in the working directory ... done\nImporting patch \"jds-mpc-i2c-to-of\" ...\nerror: patch failed: arch/powerpc/sysdev/fsl_soc.c:318\nerror: arch/powerpc/sysdev/fsl_soc.c: patch does not apply\n  Warning: Diff written to the .stgit-failed.patch file\n  stg import: git failed with code 1\n\nImport it manually....\n\njonsmirl@terra:~/ds$ patch -p1 <patches-i2c/jds-mpc-i2c-to-of\npatching file arch/powerpc/sysdev/fsl_soc.c\nHunk #1 succeeded at 320 with fuzz 2 (offset 2 lines).\npatching file drivers/i2c/busses/Makefile\npatching file drivers/i2c/busses/i2c-mpc-drv.c\npatching file drivers/i2c/busses/powerpc-common.c\npatching file drivers/i2c/busses/powerpc-common.h\npatching file include/linux/mod_devicetable.h\njonsmirl@terra:~/ds$\n\n\n-- \nJon Smirl\njonsmirl@gmail.com\n"},{"id":"66550","messageId":"20080125093849.GA6591@diana.vm.bytemark.co.uk","threadId":"11728","inReplyTo":"9e4733910801241901t230898d2t90ce2a14152e1af1@mail.gmail.com","subject":"Re: stgit: patch import with fuzz","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-01-25T09:38:49Z","receivedAt":"2008-01-25T09:38:49Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2008-01-24 22:01:37 -0500, Jon Smirl wrote:\n\n> Is there a way to allow a patch import with fuzz?\n\nNot currently. And it appears that git doesn't have this power either\n-- and I guess if it's useful in StGit, its useful in git too, so I'm\nnot too keen on making StGit call \"patch\" or some such instead of\nteaching git to do this. Then again, it'd be useful, and I doubt I'd\nget around to teaching fuzz to git-apply any time soon ...\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"66553","messageId":"m3ve5ifcnq.fsf@localhost.localdomain","threadId":"11728","inReplyTo":"20080125093849.GA6591@diana.vm.bytemark.co.uk","subject":"Re: stgit: patch import with fuzz","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-01-25T10:00:22Z","receivedAt":"2008-01-25T10:00:22Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Karl Hasselström <kha@treskal.com> writes:\n\n> On 2008-01-24 22:01:37 -0500, Jon Smirl wrote:\n> \n> > Is there a way to allow a patch import with fuzz?\n> \n> Not currently. And it appears that git doesn't have this power either\n\n\"git apply -C1 <patch>\" doesn't do that Well, that isn't import per se)? \n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"}]}