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

On Feb 24, 2008, at 04:23, Anthony Ettinger wrote:

> 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,

That's not what should have happened.

> is there any way to do the vendor
> branch upgrade w/o loosing customized data from the original source?

The merge command you showed should have done what you wanted. It
constructs a difference between vendor/wordpress/2.0.4 and vendor/
wordpress/current and applies that diff to projects/htdocs. Should work.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-02-25 12:45:28 CET