This is the mail archive of the cygwin@cygwin.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Why is patch(1) asking for the file names already given? [closed]


Max Bowsher wrote:

/ Constantine <cnst@rbcmail.ru> wrote:


I am trying to apply a patch I made for myself. When I am running the
patch(1) utility, I am always being asked to type in the file name to
a file that needs to be patched.


Max Bowsher wrote:


Perhaps your patch file is corrupt.
Please post the first 10 lines of it.


Constantine wrote:


--- start ---
diff -b -B --exclude='*.*htm*' -r en-US/.jar/autoconfig/contents.rdf
en-GB/.jar/autoconfig/contents.rdf
7c7
< <RDF:li resource="urn:mozilla:locale:en-US"/>
---
> <RDF:li resource="urn:mozilla:locale:en-GB"/>
11c11
< <RDF:Description about="urn:mozilla:locale:en-US">
---
> <RDF:Description about="urn:mozilla:locale:en-GB">
--- end ---



Ah. No wonder it isn't working. "Normal" diffs don't store any filename information.
Use diff -u or diff -c.


Max.

Thank you very much indeed!
That solved the problem. I have tried to use that options before, but without "-p1 -d ./en-GB/", so I thought that they won't help.


Cheers,
Constantine.


-- Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple Problem reports: http://cygwin.com/problems.html Documentation: http://cygwin.com/docs.html FAQ: http://cygwin.com/faq/


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]