From: "Jon Smirl" <jonsmirl@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Subject: stgit: patch import with fuzz
Date: Thu, 24 Jan 2008 22:01:37 -0500 [thread overview]
Message-ID: <9e4733910801241901t230898d2t90ce2a14152e1af1@mail.gmail.com> (raw)
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
next reply other threads:[~2008-01-25 3:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-25 3:01 Jon Smirl [this message]
2008-01-25 9:38 ` stgit: patch import with fuzz Karl Hasselström
2008-01-25 10:00 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9e4733910801241901t230898d2t90ce2a14152e1af1@mail.gmail.com \
--to=jonsmirl@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).