db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jean T. Anderson" <...@bristowhill.com>
Subject Re: Questions about committing doc patches
Date Mon, 04 Dec 2006 20:00:55 GMT
Andrew McIntyre wrote:
> On 12/4/06, Jean T. Anderson <jta@bristowhill.com> wrote:
> 
>> Andrew McIntyre wrote:
>> > On 12/4/06, Laura Stewart <scotsmatrix@gmail.com> wrote:
>> ...
>> >> Step 3
>> >> If your machine is a different architecture from the machine on which
>> >> the patch was created, convert the file.
>> >>
>> >> Question - Aren't all patch files diff files? How will I know that the
>> >> patch was created on a different machine?  I use Windows, what should
>> >> I look for to know that the patch was created in UNIX?  Is the syntax:
>> >> unix2dos patch.diff      or       unix2dos > patch.diff  ?
>> >
>> > I think step 3 should be removed. All patch files will be unified
>> > format diff files, as output by svn diff. Any patch program should be
>> > able to compensate for line-ending differences, since presumably on
>> > Windows you'll be using Cygwin's patch program. So, there should never
>> > be a need to convert the line-endings in the file.
>> >
>>
>> I get errors on Linux if I don't convert the file. You don't have this
>> problem?
> 
> Nope, I get:
> 
> patching file path/to/file
> (Stripping trailing CRs from patch.)
> 
> with GNU patch v2.5.8.

ok, let's remove that step 3 then. (I'm on an older version of patch,
will update).

 -jean



Mime
View raw message