Re: merge_test.py-4 failing over DAV

Ben Collins-Sussman <sussman@collab.net> writes:

> "Glenn A. Thompson" <gthompson@cdr.net> writes:
>
> > CMD: svn "merge" "--dry-run" "-r2:1"
> > "http://localhost/repositories/merge_tests-4/A/B"
> > "working_copies/merge_tests-4/A/B2"
> > ../svn/subversion/libsvn_ra_dav/util.c:332: (apr_err=175002, src_err=0)
> > svn: RA layer request failed
> > svn: REPORT request failed on /repositories/merge_tests-4/A/B
> > ../svn/subversion/libsvn_ra_dav/util.c:316: /src_err=0)
> > svn: The REPORT request returned invalid XML in the response: XML
> > parse error at line 13: not well-formed (invalid
> > token). (/repositories/merge_tests-4/A/B)
> > CMD: svn "merge" "-r2:1"
> > "http://localhost/repositories/merge_tests-4/A/B"
> > "working_copies/merge_tests-4/A/B2"
> > ../svn/subversion/libsvn_ra_dav/util.c:332: (apr_err=175002, src_err=0)
> > svn: RA layer request failed
> > svn: REPORT request failed on /repositories/merge_tests-4/A/B
> > ../svn/subversion/libsvn_ra_dav/util.c:316: (apr_err=175002, src_err=0)
> > svn: The REPORT request returned invalid XML in the response: XML
> > parse error at line 13: not well-formed (invalid
> > token). (/repositories/merge_tests-4/A/B)
> > FAIL: merge_tests.py 4: some simple property merges
>
> I'm also getting a failure of merge test #4 (with r3660), but I'm not
> seeing this invalid XML error. I'm seeing a different error. All of
> the merges work fine... but the final 'svn status' is bad:

I get a failure after the first commit. Looks like my recent status
output changes have caused it. I think the problem is that
mod_dav_svn is returning the name "anonymous" for revisions without an
author. Previously this got truncated to 8 characters and now it gets
displayed in full.

If I do this

Index: subversion/mod_dav_svn/repos.c
===================================================================
--- subversion/mod_dav_svn/repos.c (revision 3661)
+++ subversion/mod_dav_svn/repos.c (working copy)
@@ -1154,7 +1154,7 @@
 
   /* Remember who is making this request */
   if ((repos->username = r->user) == NULL)
- repos->username = "anonymous";
+ repos->username = "anon";
 
   /* open the SVN FS */
   serr = svn_repos_open(&(repos->repos), fs_path, r->pool);

the tests pass over ra_dav. Really we need to fix the test suite,
I'll have a look but it's somewhere in that tree stuff and I'm not
sure I understand it...

I "ran" the dav test manually before committing, but looking at my
command history I used "--url=URL" instead of "--url URL", and that
uses ra_local :-/

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org