You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Sebastian Bauer <ma...@sebastianbauer.info> on 2009/12/23 11:22:05 UTC

How to continue an aborted svn merge session?

Hello,

I trying to merge changes of two versions of a vendor tree into my trunk
branch as described in the svn book. However, the whole progress needs 
ages (perhaps as it is a repository hosted at sourceforge?) and the 
connection will eventually time out with e.g., the following error message

svn: GET of
'/svnroot/adtools/!svn/ver/110/vendor/binutils/current/gas/testsuite/gas/ia64/reloc.d':
SSL handshake failed: Secure connection truncated
(https://adtools.svn.sourceforge.net)
svn: Error reading spooled REPORT request response


It is possible to continue the merge at the last stage?

At first, I tried with a version 1.4.x of svn, which simply restarted 
the lengthy progress at the very beginning, which eventually will also 
fail. Version 1.6.x also seem to do the same though it fails with

svn: Attempt to add tree conflict that already exists
svn: Error reading spooled REPORT request response

So, is there a possibility to let "svn merge" continue from that 
position at which it stopped last time? If not, what would be a possible 
solution for my problem, i.e., how can the merging process be made 
successful under the condition that the server connection is not the 
most reliable one?

(my current workaround would be to use svk to mirror the repos, which at 
least can be continued properly after an error and then merge within 
thelocal repository, but perhaps there is a better alternative?)

Thanks in advance!

Best,
Sebastian