svn - tortoiseSVN：合并选项的修订范围，为什么显示这个结果？

Question

从树枝到树干合并范围：4-5,8

结果： 为什么 7777,8888 显示结果？？？是什么算法SVN？还是步骤？

Answer 1

恕我直言

step 1:
merge 4-5 to trunk.

trunk = branch 5 = .... 777 888 999 101010

step 2:
merge branch differences (7-8) to 'new' trunk:

diff 777 -> 7777 applied to 777 => 7777
diff 888 -> 8888 applied to 888 => 8888
diff 9999 -> 9999 applied to 999 => 999 (because nothing for appy)
diff 1010 -> 1010 applied to 101010 => 101010 (again nothing different in 10th line from 7 to 8 revision, so in result this line not changed also)

关于冲突的 333 我不确定，但可能这条线太接近真正冲突的线 - 222？尝试在测试中插入更多上下文行：

1
--
--
--
2
--
--
--
3
... 

并检查 333 是否仍然冲突。