[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Why non matching eols in patch and target. (svn patch related)

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 23 Feb 2010 23:48:07 +0100

On Tue, Feb 23, 2010 at 10:06:04PM +0100, Daniel Näslund wrote:
> On Tue, Feb 23, 2010 at 09:27:34PM +0100, Stefan Sperling wrote:
> > On Tue, Feb 23, 2010 at 08:57:26PM +0100, Daniel Näslund wrote:
> > > I have a test where the target uses '\r\n' and the patch uses '\r' . The
> > > eols are consistent within each file but we get a failure saying:
> > >
> > > [[[
> > > subversion/svn/patch-cmd.c:81: (apr_err=135000)
> > > subversion/libsvn_client/patch.c:1463: (apr_err=135000)
> > > subversion/libsvn_client/patch.c:1410: (apr_err=135000)
> > > subversion/libsvn_client/patch.c:1100: (apr_err=135000)
> > > subversion/libsvn_client/patch.c:830: (apr_err=135000)
> > > subversion/libsvn_client/patch.c:799: (apr_err=135000)
> > > subversion/libsvn_subr/subst.c:876: (apr_err=135000)
> > > subversion/libsvn_subr/subst.c:643: (apr_err=135000)
> > > svn: Inconsistent line ending style
> > > ]]]
> >
> > Where and how?
>
> It happens when we've written all our hunks and we want to copy the
> remaining lines. Here's a piece of apply_one_patch(). It's the call to
> copy_lines_to_target() that throws the error.

> The test has one line after the last hunk. If I remove that line, the
> test passes.

Can you post the test?

Thanks,
Stefan
Received on 2010-02-23 23:48:46 CET

This is an archived mail posted to the Subversion Dev mailing list.