[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 (and unrelated tree-conflicts error)

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Mon, 13 Oct 2008 10:54:41 +0200 (Jerusalem Standard Time)

Arfrever Frehtes Taifersar Arahesis wrote on Mon, 13 Oct 2008 at 01:05 +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

/me pleads guilty.

> svn: Error reading spooled REPORT request response
> $
>
> Merging using Serf:
>
> $ svn merge ^/trunk
> svn: XML parsing failed: (400 Bad Request)
> $
>
>

I tried the same merge over ra_local / fsfs into a pristine wc of the
branch @r33610.

    % svn merge --accept=postpone ^/trunk
    ..\..\..\subversion\libsvn_fs_fs\tree.c:661: (apr_err=160013)
    svn: File not found: revision 33610, path '/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005'

Karl saw a similar error trying to sync the issue-2843-dev branch.

By the way, when I tried the same merge into a wc of the branch @r33608
(before Arfrever's merge at r33609), I got a few hundred lines of conflicts
and tree-conflicts, and also a tree-conflicts error at the end ("Attempt to
add tree conflict that already exists", IIRC).

Daniel

---------------------------------------------------------------------
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-13 10:55:02 CEST

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