Once again trouble merging (1.5)

Hi,

Following my previous threads about this, once again problems.

I reintegrated a branch into trunk successfully. I now want to merge
this change into another branch. To be on the safe side, I followed
Mark’s advice[1]: the branch was made at 336, the log messages said the
last merge from trunk was at 514, so I did (let me mention that I tried
to merge first, but only after the error from below, I tried this from
the start):

> svn merge --record-only -r336:514
svn://coxorange/MonaSearch/trunk/MonaSearch

This changed the project root directory and some other files:
> svn stat
 M .
 M makefiles/Linux.mk
 M makefiles/MinGW.mk
 M makefiles/Darwin.mk
 M
src/de/uni_tuebingen/sfb/lichtenstein/exceptions/LispFormulaParseException.java

svn diff told that indeed only mergeinfo was changed on those files and
folders. Then:

> svn commit -m "Populate mergeinfo, once again"
…
Committed revision 545.

So now I can do the merge, but:

> svn merge svn://coxorange/MonaSearch/trunk/MonaSearch
svn: Cannot replace a directory from within

I did delete the branch that was reintegrated, could that be the cause?
And of course some directories were added and deleted in the
reintegration merge.

What to do?

Thanks, H.

[1]
news://news.gmane.org:119/ff892c5d0811190712j3ec25a8av2798cf4f322b1472@mail.gmail.com
=
http://mid.gmane.org/ff892c5d0811190712j3ec25a8av2798cf4f322b1472@mail.gmail.com

-- 
Hendrik Maryns
http://tcl.sfs.uni-tuebingen.de/~hendrik/
==================
Ask smart questions, get good answers:
http://www.catb.org/~esr/faqs/smart-questions.html
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979588
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].