Re: [PATCH v2] Change test suite to read file properties in XML format
Julian Foad <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.devel |
|---|---|
| Message-ID | <1248728780.8181.134.camel__26125.837051268$1248762984$gmane$org@edith.foad.me.uk> |
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<[email protected]> 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 > > *.o > > *~ > > .*~ > > > > </property> > > </target> > > </properties> > > > > The '\r\n' sequences are being folded to '\n'. But then the XML > > parser turns '
\n' into '\r\n' in the final output. > > Yuck. I wonder whether the output contains ' \n' or ' \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://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1667&dsMessageId=2376143 To unsubscribe from this discussion, e-mail: [[email protected]].