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

Re: [PATCH v2] Change test suite to read file properties in XML format

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 27 Jul 2009 22:06:20 +0100

On Mon, 2009-07-27 at 20:21 +0200, Michael Haggerty wrote:
> James Abbatiello wrote:
> > On Mon, Jul 27, 2009 at 11:15 AM, Michael Haggerty<mhagger_at_alum.mit.edu> wrote:
> >> [...]
> >> But even though SVN outputs '\r\n' on Windows, I still don't understand
> >> how the '\r\n' characters get through in the test suite.
> >
> > This had me stumped for a while too.
> > C:>svn --version
> > svn, version 1.6.3 (r38063)
> > compiled Jun 18 2009, 12:57:17
> > ...
> >
> > C:>svn proplist --verbose --xml svntest
> > <?xml version="1.0"?>
> > <properties>
> > <target
> > path="svntest">
> > <property
> > name="svn:ignore">*.pyc&#13;
> > *.o&#13;
> > *~&#13;
> > .*~&#13;
> > &#13;
> > </property>
> > </target>
> > </properties>
> >
> > The '\r\n' sequences are being folded to '\n'. But then the XML
> > parser turns '&#13\n' into '\r\n' in the final output.
>
> Yuck. I wonder whether the output contains '&#13;\n' or '&#13;\r\n'
> (i.e., does the output contain one or two extraneous CR characters?
>
> In any case, I'm defeated. Attached is a patch like the previous one,
> except that it also smashes all EOL combinations into '\n'. Feedback is
> welcome, especially from Windows users.
>
> Michael
>
> [[[
> Read svn properties in XML rather than text format in test suite.
>
> This makes the routine shorter and more robust to strange property
> values and to format changes in the text output format.

Please state the main goal of making this part of the test suite
compatible with the output of pre-1.6 svn, and the cvs2svn project's
interest in this. And this change doesn't really make it shorter if you
ignore the blank lines.

Thanks.

- Julian

> * subversion/tests/cmdline/svntest/tree.py
> (get_props): Read svn properties via "svn proplist -v" using the
> "--xml" option.
> ]]]

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2376142
Received on 2009-07-27 23:06:45 CEST

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