Re: [Subclipse-users] Re: Merging still not working properly (1.4 → 1.5)
Mark Phippard schreef:
> On Wed, Nov 26, 2008 at 12:42 PM, Hendrik Maryns
> <qwizv9b02_at_sneakemail.com> wrote:
>> Hendrik Maryns schreef:
>>> 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
>>> 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 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?
> I suspect the history of your tree is just more complicated than you
> are alluding to.
Exactly this was the case! You are a visionary!
Sorry again, H.
Ask smart questions, get good answers:
Received on 2008-11-26 20:55:14 CET
This is an archived mail posted to the Subclipse Users