mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Pat Murray <PMurray@data-display.com>
To: "ptxdist@pengutronix.de" <ptxdist@pengutronix.de>
Subject: [ptxdist] patch does not apply
Date: Thu, 5 Sep 2013 09:49:57 +0000	[thread overview]
Message-ID: <4ECD7F7A0B03E64BA50DA3C6FC2464FD071988CE@KRUSTY.ddisplay.com> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 311 bytes --]

Hi,

I'm getting the message

"Hunk #1 FAILED at 1"
1 out of 1 hunk FAILED - rejects in file xxx

Patch yyy.patch does not apply (enforce with -f )

I have used "diff -uwpr  olddir newdir " to create  the yyy.patch file.

How can I make ptxdist apply this patch , (enforce with -f)

Regards
PM


[-- Attachment #1.2: Type: text/html, Size: 996 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2013-09-05  9:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-05  9:49 Pat Murray [this message]
2013-09-05  9:57 ` Josef Holzmayr

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=4ECD7F7A0B03E64BA50DA3C6FC2464FD071988CE@KRUSTY.ddisplay.com \
    --to=pmurray@data-display.com \
    --cc=ptxdist@pengutronix.de \
    /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