* [ptxdist] patch does not apply
@ 2013-09-05 9:49 Pat Murray
2013-09-05 9:57 ` Josef Holzmayr
0 siblings, 1 reply; 2+ messages in thread
From: Pat Murray @ 2013-09-05 9:49 UTC (permalink / raw)
To: ptxdist
[-- 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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] patch does not apply
2013-09-05 9:49 [ptxdist] patch does not apply Pat Murray
@ 2013-09-05 9:57 ` Josef Holzmayr
0 siblings, 0 replies; 2+ messages in thread
From: Josef Holzmayr @ 2013-09-05 9:57 UTC (permalink / raw)
To: ptxdist
howdy!
Am 05.09.2013 11:49, schrieb Pat Murray:
> I have used “diff –uwpr olddir newdir “ to create the yyy.patch file.
Well, diff -Naur is probably a better choice, me guesses that at least
-p might be confusing. But better even, just create the patches through
git format-patch.
--
Josef"ZaP" Holzmayr
"Never underestimate the bandwidth of a freight train full of DAT tapes.
Just latency might be an issue"
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-05 9:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-05 9:49 [ptxdist] patch does not apply Pat Murray
2013-09-05 9:57 ` Josef Holzmayr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox