Comment 13 for bug 594958

I tried duplicate the bug, did not get the trace but I did get different result as I reported on bug #668399 (merge from file vs merge from branch). Following the scenario.

bzr init main
cd main
echo main > main.cpp
bzr add
bzr commit -m main1
cd ..
bzr branch main repo1
bzr branch main repo2
cd repo1
for ((i = 1; i <= 20; i++)) do echo $i > $i.file ; done
bzr add
bzr commit -m "repo1-1"
cd ../main
bzr merge /tmp/merge.input
bzr commit -m main-merge-1
cd ../repo1
echo aaaa >> 1.file
bzr commit -m "repo1-2"
echo bbbb >> 1.file
bzr commit -m "repo1-3"
echo dddd >> 1.file
bzr commit -m "repo1-4"
echo cccc >> 1.file
bzr commit -m "repo1-5"
bzr send -o /tmp/merge.input
cd ../main
bzr merge /tmp/merge.input
bzr commit -m main-merge-2
cd ../repo2
bzr pull
echo 1111 >> 19.file
bzr commit -m reop2-1
echo 2222 >> 20.file
bzr commit -m reop2-2
cd ../main
bzr merge ../repo2
bzr commit -m main-merge-3
cd ../repo1
echo ffff >> 11.file
bzr commit -m repo1-6
bzr merge
bzr commit -m merge-1
echo eeee >> 11.file
bzr commit -m repo1-7
cd ../repo2
echo 7777 >> 20.file
bzr commit -m reop2-3
bzr send -o /tmp/merge.input
cd ../main
bzr merge /tmp/merge.input
bzr commit -m main-merge-4
cd ../repo1
bzr merge
bzr commit -m merge-2
echo kkkk >> 11.file
bzr commit -m repo1-8
bzr send -o /tmp/merge.input
cd ../main
bzr merge /tmp/merge.input
bzr commit -m main-merge-5
cd ../repo2
echo aaaa >> 13.file
bzr commit -m reop2-4
cd ../main
bzr merge ../repo2
bzr commit -m main-merge-6
cd ../repo2
bzr pull
echo 77777 >> 7.file
bzr commit -m repo2-last-1
bzr commit -m repo2-last-2
cd ../repo1
bzr pull
echo fffff >> 18.file
bzr commit -m a
echo fffff >> 18.file
bzr commit -m b
echo fffff >> 18.file
bzr commit -m c
bzr send -r 8 -o /tmp/merge.input
cd ../main
bzr merge /tmp/merge.input
bzr commit -m pick-1
cd ../repo1
bzr send -r 9 -o /tmp/merge.input
cd ../main
bzr merge /tmp/merge.input
bzr commit -m pick-2
cd ../repo1
bzr merge
bzr commit -m 'merge after pick'
echo 11111 >> 1.file
bzr commit -m n1
bzr merge ../reop2
bzr commit -m merge-from-repo2
echo 22222 >> 1.file
bzr commit -m n2
bzr send -o /tmp/merge.input
cd ../main

The following result with different result
 bzr merge /tmp/merge.input
 bzr merge ../repo1