You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Dane Summers <ds...@hotmail.com> on 2003/06/19 14:23:08 UTC
Merge crashes in windows
I am trying to merge a branch back into my trunk on windows xp with a svn .23 (from linux repository version .23).
I tried to merge from the base of my working copy of the head:
svn merge -r81:head svn://.../../../branches/tag
I get:
svn: Network connection closed unexpectedly
svn: Connection closed unexpectedly
I tried to do this a month ago as well on version .22 and had the same problem.
Does merging work? How do I do it?
Any help is most appreciated
Dane Summers
Re: Merge crashes in windows
Posted by Ben Collins-Sussman <su...@collab.net>.
"Dane Summers" <ds...@hotmail.com> writes:
> svn: Network connection closed unexpectedly
> svn: Connection closed unexpectedly
Do you have a version mismatch between libsvn_ra_svn (on the client)
and svnserve (on the server)? They have to be the exact same release.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merge crashes in windows
Posted by Philip Martin <ph...@codematters.co.uk>.
Branko Äibej <br...@xbc.nu> writes:
>>You need 0.24 to run merge over ra_svn on Windows, in 0.23 svnserve is
>>single threaded and does not support the connections needed by merge.
>>
> Uh, he did say his repository was on Linux, so I'd expect svnserve to
> run there, too.
Good point! So the cause of the problem remains unknown.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merge crashes in windows
Posted by Branko Čibej <br...@xbc.nu>.
Philip Martin wrote:
>"Dane Summers" <ds...@hotmail.com> writes:
>
>
>
>>I am trying to merge a branch back into my trunk on windows xp with
>>a svn .23 (from linux repository version .23).
>>
>>svn merge -r81:head svn://.../../../branches/tag
>>
>>
>
>You need 0.24 to run merge over ra_svn on Windows, in 0.23 svnserve is
>single threaded and does not support the connections needed by merge.
>
>
Uh, he did say his repository was on Linux, so I'd expect svnserve to
run there, too.
--
Brane Čibej <br...@xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merge crashes in windows
Posted by Philip Martin <ph...@codematters.co.uk>.
"Dane Summers" <ds...@hotmail.com> writes:
> I am trying to merge a branch back into my trunk on windows xp with
> a svn .23 (from linux repository version .23).
>
> svn merge -r81:head svn://.../../../branches/tag
You need 0.24 to run merge over ra_svn on Windows, in 0.23 svnserve is
single threaded and does not support the connections needed by merge.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org