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

Problem with File Creation

From: Brian Russell <brian_at_brianrussell.co.uk>
Date: 2006-03-06 22:58:35 CET

Hi,

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.

Setup is SVN server 1.1.3 on Fedora Core 2. Two windows XP clients using
Tortoise 1.3.2.

The situation is :

Both clients at same revision

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"

 From that point on, any time I try an update on the \a\b\c directory or
any higher directory in the path, I get the error
Error: File not found: transaction 'nn', path 'xxxxx', and xxxxx seems
to vary depending on which level in the tree I am at.

Moreover, I have noticed that when this error occurs, the .svn/entries
file has an attribute "incomplete=true" for any directory that I have
attempted to update from.

I am able to (I think) recover by removing the "incomplete=true" from
any affected files, by doing a "Tortoise SVN->Update to Revision.." to
an earlier revision, deleting the second version of the new file, then
doing an update to the latest revision. This obviously is a little
"risque" since it involves editing the working copy administrative
directory (not recommended), and still doesn't allow the merge to be
within the control of Tortoise.

Am I missing something, or is this a genuine bug?

Thanks for your help and for producing a great product (honest, that
isn't just to sweet talk you to look favourably on my request :)

Brian.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Mar 6 23:20:19 2006

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