Merging question / problem?

["Leeuw van der, Tim" <ti...@nl.unisys.com>]

Hi,

I'm trying to do a merge between 2 branches of my project. The branch that
should be merged back into mainline, has a new file added. The merge-command
gives me always the following error on this new file:

$ svn merge
http://nlshl-leeuwt/svn/ZorgControles/Branches/WorkingEditorV1@35
http://nlshl-leeuwt/svn/ZorgControles/Branches/WorkingEditorV1@40
svn: RA layer request failed
svn: PROPFIND request failed on
'http://nlshl-leeuwt/svn/ZorgControles/Branches/WorkingEditorV1/EclipseProje
ct/Zorg prestatie model.xml'
svn: PROPFIND of
'http://nlshl-leeuwt/svn/ZorgControles/Branches/WorkingEditorV1/EclipseProje
ct/Zorg prestatie model.xml': 404 Not Found (http://nlshl-leeuwt)

Or with the alternative merge-syntax:

$ svn merge -r 36:HEAD
http://nlshl-leeuwt/svn/ZorgControles/Branches/WorkingEditorV1
svn: RA layer request failed
svn: PROPFIND request failed on
'http://nlshl-leeuwt/svn/ZorgControles/Branches/WorkingEditorV1/EclipseProje
ct/Zorg prestatie model.xml'
svn: PROPFIND of
'http://nlshl-leeuwt/svn/ZorgControles/Branches/WorkingEditorV1/EclipseProje
ct/Zorg prestatie model.xml': 404 Not Found (http://nlshl-leeuwt)


As you can see, there are spaces in this filename. I don't know if this
could cause the problems. The file can certainly be seen in the branch, when
I check it out or open the URL in my webbrowser.

Does anyone have an indication what the problem could be? I cannot see from
the error-message at what revision of the repository this file can't be
found, but it's new so it doesn't exist in the base version.


With regards,

--Tim van der Leeuw


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