X-Spam-Check-By:	sourceware.org
Date:	Mon, 8 Jan 2007 09:51:03 -0500 (EST)
From:	Igor Peshansky <pechtcha AT cs DOT nyu DOT edu>
Reply-To:	cygwin AT cygwin DOT com
To:	"'Markus Elfring'" <Markus DOT Elfring AT web DOT de>
cc:	cygwin AT cygwin DOT com
Subject:	RE: How to resolve hiccups by patch program?
In-Reply-To:	<023e01c7331f$38720df0$a501a8c0@CAM.ARTIMI.COM>
Message-ID:	<Pine.GSO.4.63.0701080949160.26422@access1.cims.nyu.edu>
References:	<023e01c7331f$38720df0$a501a8c0 AT CAM DOT ARTIMI DOT COM>
MIME-Version:	1.0
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 Mon, 8 Jan 2007, Dave Korn wrote:

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

And, of course, as the message you referenced suggests, try "patch -l" and
see if that helps.
	Igor
-- 
				http://cs.nyu.edu/~pechtcha/
      |\      _,,,---,,_	    pechtcha AT cs DOT nyu DOT edu | igor AT watson DOT ibm DOT com
ZZZzz /,`.-'`'    -.  ;-;;,_		Igor Peshansky, Ph.D. (name changed!)
     |,4-  ) )-,_. ,\ (  `'-'		old name: Igor Pechtchanski
    '---''(_/--'  `-'\_) fL	a.k.a JaguaR-R-R-r-r-r-.-.-.  Meow!

Freedom is just another word for "nothing left to lose"...  -- Janis Joplin

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