SVK smerge mystery
Posted by matijs 16/10/2005 at 17h18
I’m still trying to track typo’s releases while keeping my local changes. So, I have mirrored the full typo repository, and at some point I did:
svk smerge /typo/mirror/tags/release\_2\_5\_5
Now, I want to update to 2.5.6. Unfortunately, doing:
svk smerge -C /typo/mirror/tags/release\_2\_5\_6
gives me lots of conflicts even for files I did not touch myself. And look at the first line I get:
Auto-merging (0, 651) /mirror/tags/release\_2\_5\_6 to /local/trunk (base /mirror/trunk:433)
This is strange, since:
\> svk info /typo2/mirror/tags/release\_2\_5\_5
[…]
Copied From: /mirror/trunk, Rev. 530
Merged From: /mirror/trunk, Rev. 530
and
\> svk info /typo2/mirror/tags/release\_2\_5\_6
[…]
Copied From: /mirror/trunk, Rev. 648
Merged From: /mirror/trunk, Rev. 648
So, I would expect it to start the merge at 530, not at 0:
It’s trying to merge a lot more than the difference between releases 2.5.5 and 2.5.6.
Why doesn’t this do right thing? SVK hasn’t forgotton that I merged 2.5.5, since re-merging that results in an empty merge. A mystery.
[I have put this question on the svk wiki at http://svk.elixus.org/?SVKQuestions.]