Re: Add/branch/switch/remove/switch issue.

On Thu, 2004-04-08 at 04:55, Martin Tomes wrote:

> The final switch failed because the targets existed in the working copy, and they existed on the
> trunk in Subversion. I had to delete my working copy and re-checkout the trunk before I could merge
> the branch into the trunk.

Sure. This is absolutely intentional. One of the main design tenets of
Subversion is: "never *ever* lose data". That means that 'svn up' (and
'svn switch', which is just a variant of update) will *never* overwrite
unversioned data with versioned data. It will bail out and tell you
why.

> I have reproduced this below, once you are in this position parts of the WC are on the trunk URL and
> parts are on the branch URL and there is no way out that I could find.

Sure there is: delete all the unversioned files, and re-run 'up' or
'switch'. Or just checkout a new working copy.

> F:\martinto\tmp\play>svn switch http://svn.eurotherm.co.uk:81/svn/play/martinto/trunk/
> svn: Failed to add file 'sub/NotReallyWanted.txt': object of the same name already exists
> F:\martinto\tmp\play>rm sub/NotReallyWanted.txt
> F:\martinto\tmp\play>svn switch http://svn.eurotherm.co.uk:81/svn/play/martinto/trunk/
> svn: Can't copy 'sub/.svn/text-base/NotReallyWanted.txt.svn-base' to
> 'sub/.svn/tmp/text-base/NotReallyWanted.txt.svn-base.tmp': The system cannot find the file specified.

I *think* this particular bug is either already fixed, or already
filed. Philip and makl have been working on a number of 'svn switch'
bugs that look like this, whereby 'svn switch' isn't restartable when it
should be. Philip, makl... comments?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 8 14:32:48 2004