[Subclipse-users] Re: Merging still not working properly (1.4 → 1.5)

Hendrik Maryns schreef:
> Hi,
>
> Ok, so an upgrade to 1.5 etc., see my earlier posts.
>
> I just tried to merge a small change from trunk into a branch, it failed
> with the following error:
>
> org.tigris.subversion.javahl.ClientException: Invalid filesystem path syntax
> svn: Cannot replace a directory from within
>
> I think this is because it wants to go too far back in history.
>
> /MonaSearch-visualization> svn pg svn:mergeinfo
> /MonaSearch/trunk/MonaSearch:336-503
> /trunk/MSO:3-240
> /trunk/MonaSearch:241-268
>
> The branch was made at 336.
>
> What is wrong here? I think the CollabNet merge client has entered this
> wrong mergeinfo.

I think I solved it. As you can see, revisions 269 to 335 are missing
from the mergeinfo. It tried to merge them. I did

> svn merge --record-only -r269:335
svn://coxorange/MonaSearch/trunk/MonaSearch
> svn commit -m "Populate mergeinfo"

and now it worked.

I think the advice Mark gave me was wrong: you shouldn’t do a
record-only starting at when the branch was created, but starting at 1
until now to populate the mergeinfo correctly. Is this true?

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