Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sources.redhat.com/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com
Message-ID: <3EDD2F68.7010808@rbcmail.ru>
Date: Tue, 03 Jun 2003 19:29:44 -0400
From: Constantine <cnst AT rbcmail DOT ru>
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 <maxb AT ukf DOT net>
CC: cygwin AT cygwin DOT com
Subject: Re: Why is patch(1) asking for the file names already given? [closed]
References: <3EDC3908 DOT 8000805 AT rbcmail DOT ru> <m3llwjzg2s DOT fsf AT telia DOT com> <3EDD175B DOT 2080809 AT rbcmail DOT ru> <009801c32a19$f094d2e0$78d96f83 AT pomello> <3EDD1A9F DOT 8030401 AT rbcmail DOT ru> <001301c32a1e$d4e66400$78d96f83 AT 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 <cnst AT rbcmail DOT 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/