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

Re: svn add "already under version control"

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: 2006-07-19 15:49:46 CEST

On Wednesday 19 July 2006 15:14, Brian Bird wrote:
> Is there any way to force subversion to ignore the fact that a locally
> modified folder has been entirely replaced by something else and just tell
> it to save the current working copy over the repository as a new version?
>
> For example:
>
>
>
> mkdir directory # the real directory has several files inside it
> too
>
> svn add directory
>
> svn ci
>
>
>
> rm -rf directory # another program removes this directory
>
> mkdir directory # it then creates an entirely new directory with
> similar files to the original directory
>
>
>
> svn add directory # At this point I want to ignore the fact that there
> is an old version of directory already in the repository
>
> svn: warning: 'directory' is already under version control

OK, so you want to replace a dir which is already in the repository with
another dir, right?

> Subversion will not let me use the new directory because it already knows
> about a previous one. The only solutions I've found from this list or from
> google is to remove the directory and re-run svn update, but this loses any
> changes from the new directory.
>
> I want to be able to tell subversion to remove the old directory and add
> the new one as a replacement, including any files inside. If any files have
> been added/deleted then the files in the new directory should be taken as
> the right thing. Something like a "svn add -force directory"

There are two ways:
1. Just check out, overwrite with the new dir and checkin. You will have to
manually take care of added/removed files.
2. Use svn_load_dirs (mentioned in the book under 'tracking vendor sources' or
somesuch). This tries to automatically take care of added/deleted/moved files
when replacing a folder.

Uli

****************************************************
Visit our website at <http://www.domino-printing.com/>
****************************************************
This Email and any files transmitted with it are intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any reading, redistribution, disclosure or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you are not the intended recipient please contact the sender immediately and delete the material from your computer.

E-mail may be susceptible to data corruption, interception, viruses and unauthorised amendment and Domino UK Limited does not accept liability for any such corruption, interception, viruses or amendment or their consequences.
****************************************************

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 19 15:51:26 2006

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