Re: file externals fails to commit after merge

Joakim Tjernlund wrote:
> #fails with:
> #svn: Commit failed (details follow):
> #svn: Cannot commit both '/usr/local/src/my_wc/branches/b1/proj/file' and '/usr/local/src/my_wc/branches/b1/bin/file' as they refer to the same URL
>
> #svn, version 1.6.9 (r901367)

This behavior stands corrected in trunk. But still 1.6.x branch behaves the
same way as you observe. Additionally, in trunk we get the following error,
when we do an 'svn up' in some steps,

<snip>
Fetching external item into 'my_wc/trunk/proj/file'
svn: warning: The file external from 'file:///tmp/my_repo/trunk/bin/file'
cannot overwrite the existing versioned item at '/tmp/my_wc/trunk/proj/file'
</snip>

The above error does not pop up in svn 1.6.x versions. I am looking into it. We
should not try overwriting an already fetched file externals item.

-- 
Senthil Kumaran S
http://www.stylesen.org/