very strange merge behavior

Hello folks. I thought I understood merge quite swimmingly, but just
now I merged in changes from a branch into trunk and it
_comprehensively_ deleted all changes that we had made to trunk since
the branch!

Here is the command i used:

cd path/to/trunk

svn merge -r 812:HEAD http://source.ibiblio.org/svn/lyceum/branches/0.32

Any ideas?

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