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

Re: Merging fails on the svnpatch-diff branch

From: Lieven Govaerts <svnlgo_at_mobsol.be>
Date: Thu, 16 Oct 2008 11:24:40 +0200

Arfrever Frehtes Taifersar Arahesis wrote:
> I tried to merge some changes from trunk to the svnpatch-diff branch, but
> `svn merge` fails:
>
> Merging using Neon:
> (It fails at r33536)
>
> $ svn merge ^/trunk
> ...
> U tools/dist/post-to-tigris.py
> A tools/buildbot/slaves/win32-xp-VS2005
> A tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
> A tools/buildbot/slaves/win32-xp-VS2005/config.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
> A tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
> svn: '/repos/svn/!svn/bc/33609/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005' path not found
> svn: Error reading spooled REPORT request response
> $
>
> Merging using Serf:
>
> $ svn merge ^/trunk
> svn: XML parsing failed: (400 Bad Request)
> $
>

The root cause of the '400 Bad Request' you got over ra_serf is fixed in
r33687, but only with serf-trunk.

This merge over ra_serf now results in the same 'path not found" error.
I'll have a look into that.

Lieven

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-16 11:24:56 CEST

This is an archived mail posted to the Subversion Dev mailing list.