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

i won't tell you how to solve your loss of work, which may be
unrecoverable. instead i will tell you how to avoid this in
the future.

there are several ways to prevent data loss resulting from
a complicated or impossible merge.

if you feel the upcoming update may cause lots of conflicts, do
an svn export beforehand. you may also create a branch and
svn switch there before the update, then commit to the new
branch and later on merge the branches.

if you feel there the upcoming updates may cause conflicts, use
a separate branch and work there. at least you'll always be able
to commit.

2008/2/24, Anthony Ettinger <anthony_at_chovy.com>:
> 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

---------------------------------------------------------------------
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-29 20:59:48 CET