"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:
CMD: svn "merge" "-r2:1" "http://localhost/repositories/merge_tests-4/A/B" "working_copies/merge_tests-4/A/B2"
CMD: svn "status" "-v" "-u" "-q" "working_copies/merge_tests-4"
=============================================================
Expected E and actual E are different!
=============================================================
EXPECTED NODE TO BE:
=============================================================
* Node name: E
Path: working_copies/merge_tests-4/A/B2/E
Contents: None
Properties: {}
Attributes: {'status': ' M', 'repos_rev': '4', 'wc_rev': '4'}
Children: 2
=============================================================
ACTUAL NODE FOUND:
=============================================================
* Node name: E
Path: working_copies/merge_tests-4/A/B2/E
Contents: None
Properties: {}
Attributes: {'status': ' ', 'repos_rev': '4', 'wc_rev': '4'}
Children: 2
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 5 21:02:43 2002