lost all my original modification with an svn merge...

I had a direct copy of my production site in ./project/htdocs
I was trying to do a vendor branch merge, into ./project/htdocs, but
when I did, I lost all my old files that I had added and/or
customized.

this is the command I ran:

svn merge ./vendor/wordpress/2.0.4 ./vendor/wordpress/current ./project/htdocs

this resulting in deletion of files that were in ./project/htdocs
originally, but not in ./vendor/wordpress/2.0.4 originally...
not really what I wanted to do, is there any way to do the vendor
branch upgrade w/o loosing customized data from the original source?

-- 
Anthony Ettinger
408-656-2473
http://anthony.ettinger.name
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org