Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Mail-Followup-To: cygwin@cygwin.com Delivered-To: mailing list cygwin@cygwin.com Message-ID: <3EDD2F68.7010808@rbcmail.ru> Date: Tue, 03 Jun 2003 19:29:44 -0400 From: Constantine User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.4) Gecko/20030529 X-Accept-Language: en-gb, ru, en-us, en MIME-Version: 1.0 To: Max Bowsher CC: cygwin@cygwin.com Subject: Re: Why is patch(1) asking for the file names already given? [closed] References: <3EDC3908.8000805@rbcmail.ru> <3EDD175B.2080809@rbcmail.ru> <009801c32a19$f094d2e0$78d96f83@pomello> <3EDD1A9F.8030401@rbcmail.ru> <001301c32a1e$d4e66400$78d96f83@pomello> In-Reply-To: <001301c32a1e$d4e66400$78d96f83@pomello> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Max Bowsher wrote: >>>>>/ Constantine 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 >>< >>--- >> > >>11c11 >>< >>--- >> > >>--- 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/