checking out to dir with existing files

[Timothy Smith <ti...@open-networks.net>]

when i attempt to checkout to a working dir which already contains a 
copy of my project ( no tunder version control) i get this error -:

svn: Failed to add file 'ssleay32.dll': object of the same name already 
exists

now i understand why this is, but is there a way i can get the svn 
client to just ignore them, put the files under version control (if they 
are the same) and let everyone play nicely?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: checking out to dir with existing files

[David Marshall <dm...@gmail.com>]

On 5/4/05, Timothy Smith <ti...@open-networks.net> wrote:
> when i attempt to checkout to a working dir which already contains a
> copy of my project ( no tunder version control) i get this error -:
> 
> svn: Failed to add file 'ssleay32.dll': object of the same name already
> exists
> 
> now i understand why this is, but is there a way i can get the svn
> client to just ignore them, put the files under version control (if they
> are the same) and let everyone play nicely?
>

I don't know of any way to do what you wanted exactly, but I do this
sort of thing as I add directories on our server to Subversion.

Supposing I have a directory foo/ into which I want to get a WC for
.../foo/trunk without losing the files in foo/ that may be different,

mv foo foo.old
svn co .../foo/trunk foo
cp -riuv foo.old/* foo # only copy newer files and ask permission
before overwriting anything

YMMV, depending on a lot of specifics.  My little recipe may need
tweaking for your exact circumstances.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org