X-Spam-Check-By:	sourceware.org
From:	"Dave Korn" <dave DOT korn AT artimi DOT com>
To:	"'Markus Elfring'" <Markus DOT Elfring AT web DOT de>, <bug-patch AT gnu DOT org>,
	<cygwin AT cygwin DOT com>
Cc:	"'Christopher R. Gabriel'" <cgabriel AT softwarelibero DOT org>,
	"'Paul Eggert'" <eggert AT twinsun DOT 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
X-Mailer:	Microsoft Office Outlook 11
In-Reply-To:	<22728248.1168253857622.JavaMail.fmail@fmcert01.dlan.cinetic.de>
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Unsubscribe:	<mailto:cygwin-unsubscribe-archive-cygwin=delorie DOT com AT cygwin DOT com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/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

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/

- Raw text -