[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-04-02 21:51:45 CEST

solo turn <soloturn99@yahoo.com> writes:

> 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.
>
> $ 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 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.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 2 21:52:48 2003

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