problem merging to ACE_wrappers

Hi,

We use svn for a project which uses ACE/TAO library (ACE_wrappers). I tried to
merge vendor changes to our branch. It failes on both windows (abnormal program
termination) and linux (Aborted.).

Here are the commands I'm doing:

svn co svn://svn/trunk/lib/ACE_wrappers
cd ACE_wrappers
svn merge svn://svn/tags/lib/ACE_wrappers/ACE_5_3_1_and_TAO_1_3_1
svn://svn/tags/lib/ACE_wrappers/ACE_5_4_5_and_TAO_1_4_5

The merge is the command which fails.

Any idea what to do with this?

Thanks,
    Peter.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 17 16:11:24 2005