merge weirdness

hi,

i have a merge here where i see a lot of:
[[[
D doc/ices.txt
A doc/ices.txt
]]]

the actual merge was doe with

"svn merge http://svn.digium.com/svn/asterisk/trunk \
   http://svn.digium.com/svn/asterisk/team/group/autoconf_and_menuselect ."

in a WC of trunk

The branch is up2date with HEAD of trunk with svnmerge.py.
On svn update i get:
[[[
$ svn up
svn: REPORT request failed on '/svn/asterisk/!svn/vcc/default'
svn: Working copy path 'build_tools/make_svn_branch_name' does not exist in repository
]]]

zhakov found out that all "replaced" files were added r18300. on 1.4 the
merge works and svn update works aswell. but it is still broken with
1.3.x. the attached merge.log was done with 1.3.0.

2 questions come up:
why are the files shown as replaced?
what breaks the WC?

darix

-- 
           openSUSE - SUSE Linux is my linux
               openSUSE is good for you
                   www.opensuse.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org