On Mon, 5 Jun 2006, Paul M Foster wrote:
> Eben King wrote:
>
>> I _thought_ you did it like this:
>>
>> eben@pc:~/word_docs/cis-4930_object-oriented-programming/projects/complex_borland$
>> patch -p0 Complex.patch Complex-20060604-1131/Complex.cpp
>> patch: **** Only garbage was found in the patch input.
>
> You should only need to give the name of the patch file on the command line.
Like this?
eben@pc:~/word_docs/cis-4930_object-oriented-programming/projects/complex_borland$
ls
total 1.2M
4.0K bcc32.log 164K Complex.exe 4.0K
input.txt
20K cartesian to polar conversion.doc 4.0K Complex.hpp 4.0K main.cpp
4.0K Command Prompt.lnk 4.0K Complex.hpp.old 164K main.exe
4.0K compile.bat 16K Complex.obj 12K main.obj
4.0K Complex-20060604-1131/ 4.0K Complex.patch 388K main.tds
8.0K Complex.cpp 388K Complex.tds
4.0K Complex.cpp.old 4.0K Copy of main.cpp
eben@pc:~/word_docs/cis-4930_object-oriented-programming/projects/complex_borland$
patch Complex.patch
It waits as if it's expecting data on stdin when I do that. I killed that
one with ^C. This errors out:
eben@pc:~/word_docs/cis-4930_object-oriented-programming/projects/complex_borland$
patch < Complex.patch
patching file Complex.cpp
patch: **** malformed patch at line 12:
> The number of subdirectories on the paths determines whether you give it a
> -p0, -p1, etc. on the command line.
So if it's expecting to find ./foo and instead you want it to look for
./bar/baz/foo you'd give it -p2 and tell it about the victim directory?
-- "Never go off on tangents, which are lines that intersect a curve at only one point and were discovered by Euclid, who lived in the 6th century, which was an era dominated by the Goths, who lived in what we now know as Poland." - from Nov. 1998 issue of Infosystems Executive. ----------------------------------------------------------------------- This list is provided as an unmoderated internet service by Networked Knowledge Systems (NKS). Views and opinions expressed in messages posted are those of the author and do not necessarily reflect the official policy or position of NKS or any of its employees.
This archive was generated by hypermail 2.1.3 : Fri Aug 01 2014 - 20:03:49 EDT