Mailing-List: contact derby-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: <derby-dev@db.apache.org>
Received-SPF: pass (herse.apache.org: domain of mcintyre.a@gmail.com
 designates 64.233.184.238 as permitted sender)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
        s=beta; d=gmail.com;
        h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
        b=VvSlS63Ax1eA5InziOgBnMnmD5cLOY6lGzotmuZq5kQR5qW8oiXV4IZQcLXmPg4Jn0A+KV6AEaQot32bMLmZ9kkW8mo8yIgHwYYhzcC/cQzmBHKZ6ab4RKghjVLrvNsBzDTeHOwPQZeLKJNb1+bZhnsyiRukim0v8TtmCAPbAoM=
Message-ID: <54ac72d70612041157k337bf5c5jc468e24211bc8206@mail.gmail.com>
Date: Mon, 4 Dec 2006 11:57:47 -0800
From: "Andrew McIntyre" <mcintyre.a@gmail.com>
To: derby-dev@db.apache.org, jta@bristowhill.com
Subject: Re: Re: Questions about committing doc patches
In-Reply-To: <45747BBD.8000902@bristowhill.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <9f40b500612041123m1f658936h5a805d6a67738cb5@mail.gmail.com>
	 <54ac72d70612041145k60bb8875x1b325eaebf4c99ae@mail.gmail.com>
	 <45747BBD.8000902@bristowhill.com>

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.

andrew