You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Martin Nowack <ma...@se.inf.tu-dresden.de> on 2010/10/21 15:12:15 UTC

Possible Bug in merging from foreign repository

Hello,

I tried to merge form a foreign repository path in a local repository path using current svn version 1.6.13 but it fails.

Assuming you have a local empty svn directory:
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

Do I something wrong? Should I report a bug?

Thanks in advance,

Martin

Re: Possible Bug in merging from foreign repository

Posted by Stefan Sperling <st...@elego.de>.

On Thu, Oct 21, 2010 at 05:12:15PM +0200, Martin Nowack wrote:
> Hello,
> 
> I tried to merge form a foreign repository path in a local repository path using current svn version 1.6.13 but it fails.
> 
> Assuming you have a local empty svn directory:
> 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
> 
> Do I something wrong? Should I report a bug?

Please file an issue. Thank you.

Stefan