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

Re: moving an out-of-date folder in working copy

From: solo turn <soloturn99_at_yahoo.com>
Date: 2003-04-03 14:53:20 CEST

does this mean the following:
to make "move" elementary, svn update has to know that the folder was
moved, and hence is able to apply the updates on the old tree to the
new tree?

btw, how do you "revert" a move correctly? it seems that after a
revert, the new folder is not removed. and it seems you cannot do
anything with it but delete. is that right?

-s.

---------------------------------------------------------
From: Ben Collins-Sussman <sussman@collab.net>
Date: 02 Apr 2003 13:51:45 -0600
Content-Type: text/plain; charset=us-ascii

'svn mv' == 'svn cp; svn rm'

So what's happening there is that you effectively ran these commands:

  $ svn cp tags/v1.0 trunk/v
 
  $ svn rm tags/v1.0

Now you try to commit, and the deletion of tags/v1.0 is failing,
because somebody changed it on the server.

You'll have to 'svn revert' your move, update, and try the move again

--- solo turn <soloturn99@yahoo.com> wrote:
> how do you locally move an out-of-date folder? do "svn up" on the
> folder is not an option, as in the meantime somebody else might
> change the folder while the local move is running.
>
> or is local move anyway not possible/not suggested?
>
> example:
>
> $ svn mv tags/v1.0 trunk/v
> ....
>
> $ svn ci -m "move folder"
> Deleting tags/v1.0
> svn: Item is out-of-date.
> svn: Commit failed (details follow):
> svn:
> Item '/tags/v1.0' is out of date.
>
> $ svn up tags/v1.0
> svn: Can't find an entry
> svn: svn_wc_is_wc_root: 'v1.0' is not a versioned resource
>
>
> __________________________________________________
> Do you Yahoo!?
> Yahoo! Tax Center - File online, calculators, forms, and more
> http://tax.yahoo.com
>

__________________________________________________
Do you Yahoo!?
Yahoo! Tax Center - File online, calculators, forms, and more
http://tax.yahoo.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 3 14:54:08 2003

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