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

Failed to add 'XXX': object of the same name already already exists not working on Tortoise 1.5.0

From: Gottfried Chen <gottfried.chen_at_gmail.com>
Date: Fri, 18 Jul 2008 15:08:05 +0200

Hi,

I tried a test with a colleague at work. When I create a file test.txt
locally in our project, he does the same in the same project location,
adds the file and commits it. Then I do an update via svn command line
-> I get "Failed to add 'XXX': object of the same name already already
exists" which is the desired behaviour as SVN should never overwrite
local files. But with Tortoise 1.5.0 it simply says "merged", but
actually didn't merge the files, instead it thinks that the file is up
to date, but when I do a diff I see that the local file is different
to the repository version, when I do a commit then my version
overwrites his changes!

That behaviour has already caused some hard to track bugs. So I wanted
to know whether this is a settings that can be changed in Tortoise
1.5.0 or if this is actually a bug.

Related to this we also had the case in the past where rarely Tortoise
(then still in version 1.3.2) said that the working copy is up to
date, but some files again were not merged correctly and some changes
were not put into the local version. After a commit one programmer
would then have overwritten some changes from another colleague with
the old version.

Any help would be greatly appreciated as people start to lose their trust in SVN

Thanks
Gottfried Chen

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-18 15:08:37 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.