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

Re: Problem with File Creation

From: Sven Brueggemann <SBrueggemann_at_gmx.net>
Date: 2006-03-07 10:04:29 CET

Brian Russell wrote:

> I am not sure if this is a SVN or a tortoise issue, but since I am only
> using Tortoise for the client, I think it appropriate to post here.
> Create a new file /a/b/c/d.txt on client 1.
> Commit changes on client 1.
> Create a new file /a/b/c/d.txt on client 2. (same name as other client,
> but different file contents.)
> Before committing client 2, I perform an "SVN update" on path /a/b/c. I
> would expect to get a conflicting file d.txt, which would need merged
> and resolved.
> Instead I get the error
> "Error: Failed to add file 'e:\svn\a\b\c\d.txt': object of the same name
> already exists"

Did you add the file to version control on client 2? If not, this is
expected behaviour since subversion never touches files that are not under
version control. Imagine: The file could be binary and be totally screwed
up by adding conflict markers - and for unversioned files there is no
pristine copy to revert to.

Kind regards

Sven

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Mar 7 10:04:29 2006

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