Alright, a couple of interesting things.
First, the reason I missed this before is because it's a heisenbug! It
only happens in release builds; in debug builds it works perfectly fine.
Second, your patch reveals that something is seriously messed up. Check
it out:
> C:\Projects\Hegemony.rick>svn merge http://redacted.example.com/svn/Hegemony/trunk//
> svn: URL 'http://redacted.example.com/svn/Hegmony/Resources Src/Entities/Pedia/pedia_MoraleArrow.png.xnt' is malformed or its scheme or host or path is missing
>
> C:\Projects\Hegemony.rick>cd src
>
> C:\Projects\Hegemony.rick\src>svn merge http://redacted.example.com/svn/Hegemony/trunk/src/
> svn: Target path does not exist
>
> C:\Projects\Hegemony.rick\src>svn info
> Path: .
> URL: http://redacted.example.com/svn/Hegemony/branches/rick/src
> Repository Root: http://redacted.example.com/svn
> Repository UUID: dc761664-1389-1943-8935-1db54473a7ad
> Revision: 10614
> Node Kind: directory
> Schedule: normal
> Last Changed Author: rick
> Last Changed Rev: 10572
> Last Changed Date: 2008-07-24 23:59:21 -0400 (Thu, 24 Jul 2008)
>
> C:\Projects\Hegemony.rick\src>svn info http://redacted.example.com/svn/Hegemony/trunk/src
> Path: src
> URL: http://redacted.example.com/svn/Hegemony/trunk/src
> Repository Root: http://redacted.example.com/svn
> Repository UUID: dc761664-1389-1943-8935-1db54473a7ad
> Revision: 10614
> Node Kind: directory
> Last Changed Author: rick
> Last Changed Rev: 10608
> Last Changed Date: 2008-07-29 00:01:42 -0400 (Tue, 29 Jul 2008)
>
> C:\Projects\Hegemony.rick\src>cd "..\Resources Src"
>
> C:\Projects\Hegemony.rick\Resources Src>svn merge "http://redacted.example.com/svn/Hegemony/trunk/Resources Src"
> svn: URL 'http://redacted.example.com/svn/Hegemony/branches/rob/Resources Src/Entities/Pedia/pedia_MoraleArrow.png.xnt' is malformed or its scheme or host or path is missing
First, it chopped out the '/trunk/' part of the remote URL. Then it
insisted that /trunk/src doesn't exist, even though 'svn info' doesn't
agree, and then it tried to merge with my coworker's branch!
Any idea what's going on here? Should I dump and reload?
-Rick-
Julian Foad wrote:
> Did you ever get a chance to try with the more-informative-error-message
> patch:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-29 16:43:39 CEST