Re: SVN merge attempting to reintegrate on a merge to a branch

On Mon, Sep 16, 2013 at 11:31:09AM +0000, Goor, Stefan wrote:
> Hi Stefan,
>
> Thanks for your email.
>
> The out put of those commands is below:
[...]

Assuming the output was sanitised correctly, it looks ok.
 
> I tried to run the checkout on the server using the file:// protocol but
> it won't allow me to use it as I got the following error:
>
> C:\Users\Administrator> C:\csvn\bin\svn co
> "file://C:/csvn/data/repositories/REPO"
> svn: E180001: Unable to connect to a repository at URL
> 'file://C:/csvn/data/repositories/REPO

You need 3 leading slashes. Two for the protocol prefix, plus one for
the root directory to create an absolute path in the URL. So try this:
 file:///C:/csvn/data/repositories/REPO
Received on 2013-09-16 13:42:36 CEST