[SVN-3738] Merging (from foreign repository) fails

• Type: Bug
• Status: Open
• Priority: Minor
• Resolution: Unresolved
• Affects Version/s: 1.6.x
• Fix Version/s: unscheduled
• Component/s: contrib/svnmerge.py

Environment

Linux

• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 21/Oct/10 21:42
• Updated: 17/Feb/15 16:41

Description

I tried to merge from a foreign repository into an local checked out working copy which is empty
using the latest self-compiled version 1.6.13 on ubuntu 10.10 and the distribution provided version as 
well (1.6.12 (r955767) ).
The attempts to merge failed.

svn merge http://llvm.org/svn/llvm-project/dragonegg/trunk

I get the following output:

--- Merging (from foreign repository) r74898 through r83829 into '.':
A    llvm-debug.cpp
A    llvm-backend.cpp
  C gcc-patches
A    darwin
...
A    exports.map
G    llvm-backend.cpp
svn: Attempt to add tree conflict that already exists at 'gcc-patches'
svn: Error reading spooled REPORT request response

Thanks.

Original issue reported by martinn