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

Merging fails on the svnpatch-diff branch

From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta_at_gmail.com>
Date: Mon, 13 Oct 2008 01:05:37 +0200

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

-- 
Arfrever Frehtes Taifersar Arahesis

Received on 2008-10-13 01:09:30 CEST

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