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

前端 未结 6 1706
感动是毒
感动是毒 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:28

    This not an answer but a clarifying question.

    My error message is:

    Reintegrate can only be used if revisions 2669 through 3403 were previously merged from
    https://../schemas
    to the integrate source, but this is not the case:
    trunk/schemas:
    Missing ranges:
    ../schemas:2673,2682,2720,2736,2878,2960,3003,3057
    

    I merged the revisions using the solution provided by @Greg Trevellick, still getting the error message.

    When I open the svn:mergeinfo property following the answer by @pako on the schemas folder, the content looks like

    /branches/repos_develop_os/trunk_branch-os/schemas:3329
    /trunk/schemas:2669-2673,2682,2720,2736,2878,2960,3003,3057
    

    I'm not sure how should I modify this content. It looks like the missing ranges are all there.

提交回复
热议问题