Hej!
Jag försöker patcha ett Wordpress Theme. Orginalfilerna ligger i katalogen ./garland-revisited.1.72/garland-revisited/. Så här ser första raderna ut i min .diff fil:
Kod:
diff -b -i -r ./garland-revisited.1.72/garland-revisited/footer.php ./garland-revisited.1.72/garland-revisited-new/footer.php
4,11c4,18
< Valid <a href="http://validator.w3.org/check?uri=referer" title="Valid XHTML Strict 1.0">XHTML Strict 1.0</a> • Theme: Garland-revisited by <a href="http://www.pross.org.uk">Pross</a><br />
Men när jag försöker patcha så får jag felmeddelande:
Kod:
Radioaktivitets-MacBook-Pro:diff radioaktivitet$ patch -p0 -i ./garland-revisited.1.72.diff --dry-run --verbose
Hmm... Looks like a normal diff to me...
(Stripping trailing CRs from patch.)
can't find file to patch at input line 2
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -b -i -r ./garland-revisited.1.72/garland-revisited/footer.php ./garland-revisited.1.72/garland-revisited-new/footer.php
--------------------------
File to patch: ^C
Radioaktivitets-MacBook-Pro:diff radioaktivitet$