[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Goor, Stefan <SGoor_at_thetasgroup.com>
Date: Mon, 16 Sep 2013 11:51:30 +0000

Hi Stefan,

On 16/09/2013 12:41, "Stefan Sperling" <stsp_at_elego.de> wrote:

>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.

Yes I sanitised the project names but I diffed the output and the local
and remote command responses were identical.

>> 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

Sorry for that, I should have spotted the missing slash! The local merge
gave the same result:

C:\Users\Administrator\my_project_branch>C:\csvn\bin\svn merge
epositories/REPO/trunk/my_project" .
svn: E195016: Reintegrate can only be used if revisions 4401 through 4587
were p
reviously merged from
eatures/my_project_branch to the reintegrate source, but this is not the
    Missing ranges: /trunk/my_projec:4485
    Missing ranges:

Please let me know if I can post any further information to help identify
the issue.

Many Thanks,
Received on 2013-09-16 13:52:07 CEST

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.