Missing ranges error message when reintegrating a branch into trunk in Subversion 1.5

前端 未结 6 1705
感动是毒
感动是毒 2020-12-29 03:52

I\'m trying to reintegrate a development branch into the trunk in my Subversion 1.5 repository. I merged all the changes from the trunk to the development branch prior to th

6条回答
  •  醉酒成梦
    2020-12-29 04:25

    I had this issue, and it was ultimately caused by the erroneous SVN properties against a folder in my branch.

    The solution was easy - I merged from trunk to my branch using the specific revision number that had been reported as missing e.g.

    And then specifying to only record the merge e.g.

    This action correctly brought my branch into line with trunk, and my subsequent branch reintegration into trunk worked successfully, without the missing ranges error message.

    This technique avoided any manual editing of any svn:mergeinfo properties against any files/folders.

提交回复
热议问题