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

Re: [PATCH]merge_tests.py test 4 fails on trunk as a result of r22510

From: <svnlgo_at_mobsol.be>
Date: 2006-11-30 16:06:25 CET

Quoting Kamesh Jayachandran <kamesh@collab.net>:

>
> > Kamesh,
> >
> > your patch fails on Windows. It works when instead of using os.linesep you
> use
> > '\n'. Attached patch solves this. Can you test this on linux to see if it
> works
> > there too?
> >
> > Lieven
> >
> > ----------------------------------------------------------------
> > This message was sent using IMP, the Internet Messaging Program.
> >
>
> I originally wrote a patch exactly like yours then realized that it
> might cause a problem in windows.
>
> As r22510 appends APR_EOL_STR, I thought that os.linesep is the way to go.

In python when you use '\n' that's automatically converted to CR, LF or CRLF
depending on the platform. os.linesep is '\r\n' on Windows, but because \n is
converted actually it becomes '\r\r\n'. You probably only use os.linesep when
writing in binary mode to files.

> Can you confirm what you see APR_EOL_STR in your apr.h in windows build?
> If that is '\r\n' my patch should work, else I am curious to know why it
> is not '\r\n'.
The code is working fine, because APR_EOL_STR is used CRLF is added to the
conflict description.

Committed the adapted fix in r22516. Thanks!

Lieven

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 30 16:06:42 2006

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