[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: file externals fails to commit after merge

From: Senthil Kumaran S <senthil_at_collab.net>
Date: Mon, 24 May 2010 12:37:20 +0530

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/
Received on 2010-05-24 10:08:01 CEST

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