"REPORT request failed" while merging
From: Stefanus Du Toit <sjdutoit_at_cgl.uwaterloo.ca>
Date: 2004-06-16 00:29:51 CEST
Hello,
I have a subversion repo, accessed over WebDAV using svn 1.0.3 and
I made a branch earlier today, and was just trying to merge it into the
I try:
sjdutoit_at_huey:~/svn/sh$ svn merge -r 1054:HEAD https://XXX/svn/sh/sh/branches/progwrap
(~/svn/sh contains a fresh trunk checkout).
Unlike http://www.contactor.se/~dast/svnusers/archive-2004-03/2091.shtml
The apache2 error log says:
--- [Tue Jun 15 18:26:32 2004] [error] [client XXX] Provider encountered an error while streaming a REPORT response. [500, #0] [Tue Jun 15 18:26:32 2004] [error] [client XXX] A failure occurred while driving the update report editor [500, #160005] [Tue Jun 15 18:26:32 2004] [error] [client XXX] Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry [500, #160005] --- Here's the log for the branch: ------------------------------------------------------------------------ r1056 | sjdutoit | 2004-06-15 17:58:30 -0400 (Tue, 15 Jun 2004) | 1 line Changed paths: M /sh/branches/progwrap/ChangeLog M /sh/branches/progwrap/backends/cpu/CPU.cpp M /sh/branches/progwrap/backends/cpu/CPU.hpp M /sh/branches/progwrap/backends/gl/Arb.cpp M /sh/branches/progwrap/backends/gl/Arb.hpp M /sh/branches/progwrap/backends/gl/ArbCode.cpp M /sh/branches/progwrap/backends/gl/ArbCode.hpp M /sh/branches/progwrap/backends/gl/GlBackend.cpp M /sh/branches/progwrap/backends/gl/GlBackend.hpp M /sh/branches/progwrap/backends/gl/PBufferStreams.cpp M /sh/branches/progwrap/backends/gl/PBufferStreams.hpp M /sh/branches/progwrap/src/Makefile.am M /sh/branches/progwrap/src/ShBaseTextureImpl.hpp M /sh/branches/progwrap/src/ShChannelImpl.hpp M /sh/branches/progwrap/src/ShEnvironment.cpp M /sh/branches/progwrap/src/ShEnvironment.hpp M /sh/branches/progwrap/src/ShNibblesImpl.hpp M /sh/branches/progwrap/src/ShProgramNode.cpp M /sh/branches/progwrap/src/ShSyntax.hpp M /sh/branches/progwrap/src/ShTransformer.cpp M /sh/branches/progwrap/src/ShTransformer.hpp M /sh/branches/progwrap/test/regress/Makefile M /sh/branches/progwrap/test/regress/regress.py M /sh/branches/progwrap/test/regress/test.hpp M /sh/branches/progwrap/util/ShKernelLib.cpp I declare this branch done. ------------------------------------------------------------------------ r1055 | sjdutoit | 2004-06-15 16:24:48 -0400 (Tue, 15 Jun 2004) | 1 line Changed paths: A /sh/branches/progwrap (from /sh/trunk:1046) R /sh/branches/progwrap/configure.ac (from /sh/trunk/configure.ac:1047) M /sh/branches/progwrap/src/Makefile.am M /sh/branches/progwrap/src/ShAlgebra.cpp M /sh/branches/progwrap/src/ShAlgebra.hpp M /sh/branches/progwrap/src/ShAttribImpl.hpp M /sh/branches/progwrap/src/ShBackend.hpp M /sh/branches/progwrap/src/ShContext.cpp M /sh/branches/progwrap/src/ShContext.hpp M /sh/branches/progwrap/src/ShCtrlGraph.cpp M /sh/branches/progwrap/src/ShCtrlGraph.hpp M /sh/branches/progwrap/src/ShEnvironment.cpp M /sh/branches/progwrap/src/ShEnvironment.hpp M /sh/branches/progwrap/src/ShFixedManipulator.cpp M /sh/branches/progwrap/src/ShInstructions.cpp M /sh/branches/progwrap/src/ShInternals.cpp M /sh/branches/progwrap/src/ShInternals.hpp M /sh/branches/progwrap/src/ShManipulatorImpl.hpp M /sh/branches/progwrap/src/ShProgram.cpp M /sh/branches/progwrap/src/ShProgram.hpp A /sh/branches/progwrap/src/ShProgramNode.cpp (from /sh/trunk/src/ShProgram.cpp:1046) A /sh/branches/progwrap/src/ShProgramNode.hpp (from /sh/trunk/src/ShProgram.hpp:1046) M /sh/branches/progwrap/src/ShStream.cpp M /sh/branches/progwrap/src/ShSyntax.cpp M /sh/branches/progwrap/src/ShTransformer.cpp M /sh/branches/progwrap/src/ShTransformer.hpp M /sh/branches/progwrap/src/ShVariableNode.cpp M /sh/branches/progwrap/src/scripts/ShAttribImpl.hpp.py A /sh/branches/progwrap/test/Makefile.am (from /sh/trunk/test/Makefile.am:1047) R /sh/branches/progwrap/test/regress (from /sh/trunk/test/regress:1047) M /sh/branches/progwrap/test/regress/Makefile R /sh/branches/progwrap/test/regress/regress.py (from /sh/trunk/test/regress/regress.py:1046) R /sh/branches/progwrap/test/regress/test.cpp (from /sh/trunk/test/regress/test.cpp:1046) R /sh/branches/progwrap/test/regress/test.hpp (from /sh/trunk/test/regress/test.hpp:1046) branch program wrapper ------------------------------------------------------------------------ That's all. If you need anything else, let me know. If you have any ideas I'd appreciate them. Apologies if this is fixed in 1.0.5, I don't have direct control over the subversion installation though, so I can't easily upgrade. -- Stefanus Du Toit <sjdutoit@cgl.uwaterloo.ca> Computer Graphics Lab School of Computer Science University of Waterloo --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For additional commands, e-mail: users-help@subversion.tigris.orgReceived on Wed Jun 16 00:31:26 2004 |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.