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

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

    You have to merge the revisions r280 to r324 from trunk into your branch first.

    It seems you already merged r325 into your branch, however --reintegrate needs to get all revisions up to your latest revision merged. There must be no gap. So here a little Diag:

               +----------------------> /branches/devel
              /                    /   \<--merge not working!
     --------/-------+--+---+-----+---------> trunk
             |       \  |  /      |
            280       \ V /      325
                        V
                      missing sync merges from trunk to branch
    

    I think this is your branch structure, so you need to sync all changes from trunk to your branch. You only merged r325, so just merge r280-r324 and after doing this you should be fine to use --reintegrate

提交回复
热议问题