Problem merging after upgrade to 1.5

Hi,

I just did an upgrade of our server, which finally brought our svn
server to version 1.5.

The old repo was copied back on the renewed server from a backup, user
rights were reinstalled etc.

I did svnadmin upgrade in the root directory of the repo, which finished
very fast without errors. I did not use the python script to populate
nodes since the repo is fairly small (500 revisions of a few hundred files).

I did this as root, which was not a good idea, since it made some of the
files unreadable for svnserve. Committing was no longer possible, but
this was solved by chown everything back to svn:svn.

Now I made a small change on the trunk (only changed a number, really),
committed and wanted to merge this into a branch.

I especially installed the CollabNet desktop for Eclipse to have the 1.5
merging functionality in Eclipse. So I tried using it and saw that it
executed the command

merge svn://coxorange/MonaSearch/trunk/MonaSearch
/home/hendrik/workspace/MonaSearch-visualization
    --- Merging r257 through r501 into
/home/hendrik/workspace/MonaSearch-visualization

Multiple problems here:
- it is only supposed to merge r499 to r501, but since I did the upgrade
between 499 and 500, I understand that it cannot know this.
- after skipping some files, it took forever, I had to cut down the process.

I then tried from the command line, but had similar problems:
(at the root of the branch:)

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

After reading some more on the new merge functionality, I think I need
--record-only, but I am unsure how.

Would

svn merge --record-only -r499:1 svn://coxorange/MonaSearch/trunk/MonaSearch

be the first step and then a second merge with the original command?

Surely, other people must have upgraded their repos, didn’t they stumble
into this?

H.

-- 
Hendrik Maryns
http://tcl.sfs.uni-tuebingen.de/~hendrik/
==================
Ask smart questions, get good answers:
http://www.catb.org/~esr/faqs/smart-questions.html