I've come across a strange problem that is only an issue on my Apache hosted
repository.
Using a file:// url this is not an issue.
Using Tortoise, when I try to do a unified diff I get this error:
Error: REPORT request failed on '/svn/logistics/!svn/vcc/default'
Error: The REPORT request returned invalid XML in the response: XML parse error
at line 9: not well-formed (invalid token) (/svn/logistics/!svn/vcc/default)
Doing a diff or unified diff has the same result.
This has been especially troublesome in trying to do a merge.
When doing a merge aforementioned functions don't work and dry run and merge
don't work either (they get the same error).
When I do the exact same procedure with a file:// I don't get any error at all.
Finally, what makes this even more odd is that if I select a single *file* for a
merge it works a little better.
If I set the "From Revision" to the revision *after* the initial add of the
branch file, then:
Diff seems to work on the merge screen in this case.
Dry run seems to work
Merge seems to work
However, unified diff doesn't work (same XML error described above)
If I set the "From Revision" to the revision *of* the inital add of the branch
file, then:
Diff still works
Dry run still works
Merge still works
Unified diff has a new error message:
'https://example.com/TestBranchDirectoryURL/test.txt' was not found in the
repository at revision 522
And unified diff still doesn't work.
I'm not sure what the cause of this is.
I we were running server version 1.3.2 and we just upgraded to 1.4 to see if
that would fix the problem (it didn't).
I'm not to knowledgable about the command line interface (so I haven't tried
merging there). However, the diffs I tried on the command line:
svn diff -r 230 createtabs.sql
done from the within working copy as the current working directory.
had the exact same XML error (actually line number error changes).
Daniel
Daniel
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 22 00:35:45 2006