Reintegrate can only be used if revisions X through Y were previously merged from to reintegrate the source, but this is not the case

后端 未结 11 1815
野的像风
野的像风 2020-12-04 05:54

Been using SVN branches with Tortoise 1.6. I\'ve been periodically merging the trunk into the branch to keep it up to date.

Today, I thought I\'d reintegrate the br

11条回答
  •  無奈伤痛
    2020-12-04 06:44

    See also my answer here for my experience with a similar case. I'm not sure if this is the source of your problem, but it does look like Subversion 1.8 has problems with the mergeinfo when two changes cancel each other.

提交回复
热议问题