From: "Dave Korn" <dave.korn@artimi.com>
To: "'Markus Elfring'" <Markus.Elfring@web.de>, <bug-patch@gnu.org>,
   <cygwin@cygwin.com>
Cc: "'Christopher R. Gabriel'" <cgabriel@softwarelibero.org>,
   "'Paul Eggert'" <eggert@twinsun.com>
Subject: RE: How to resolve hiccups by patch program?
Date: Mon, 8 Jan 2007 12:19:18 -0000
Message-ID: <023e01c7331f$38720df0$a501a8c0@CAM.ARTIMI.COM>
MIME-Version: 1.0
Content-Type: text/plain; 	charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
In-Reply-To: <22728248.1168253857622.JavaMail.fmail@fmcert01.dlan.cinetic.de>
Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm
Precedence: bulk
Sender: cygwin-owner@cygwin.com
Mail-Followup-To: cygwin@cygwin.com

On 08 January 2007 10:58, Markus Elfring wrote:

> Hello,
> 
> I published the file "const4.patch"
> (http://bugs.digium.com/file_download.php?file_id=12617&type=bug) 

> I assume that I am not affected by wrong line endings as it was suggested
> for the topic 'Is "Patch" broken?'. 
> http://sourceware.org/ml/cygwin/2004-04/msg00334.html

  I think you are, since your patch has CRLF line ends.  If you're using
Tortoise, it's probably auto-mangling the line-ends for you.  It likes to be
"helpful" like that, but what you actually tend to end up with is a working
tree that isn't interoperable with cygwin.

  Does running d2u over the rejected hunk fix your problem?  Does generating
the patch by the commandline svn client under cygwin generate a patch in the
correct format for the patch utility under cygwin?

    cheers,
      DaveK
-- 
Can't think of a witty .sigline today....


--
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/