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

Re: Switching to temp branch causes "Failed to add file 'fileB.txt': object of the same name already exists"

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-02-03 15:07:44 CET

Francois Beausoleil wrote:

> $ svn add fileB.txt
> A fileB.txt
>
> $ svn copy . file:///repos/branches/temp-branch --message "Creating
> temporary branch"

Hm, if there *is* a bug here, it might be related to this copy command.
  I don't really understand how our 'svn cp WC URL' codepath behaves
when it sees files scheduled for addition. It looks to me as though it
does not ignore them, but instead(1) commits them, (2) leaves them still
scheduled for addition. Is that the case? And is that correct?
(Thoughts?)

> $ svn switch file:///repos/branches/temp-branch
> svn: Failed to add file 'fileB.txt': object of the same name already
> exists

...in which case, this behavior is no surprise. When the client
describes its working copy to the server, it never mentions files
scheduled for addition. They're not yet officially part of any revision
yet. So during the swith (update), the server is trying to add a file
by the same name, and gets a standard tree-conflict with the
schedule-add file.

So the real question here (for developers): is the copy behavior doing
the right thing in this scenario?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 3 15:08:26 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.