Comment 11 for bug 603395

PresuntoRJ: please file a new bug and we can dig into what's going wrong for you there. I think you probably have a slightly different situation to the one described in this bug; if I'm wrong we can always mark the new report as a duplicate and re-open this one, but for now let's start with a clean slate.

For what it's worth, here's a shell script that shows this fix working for me:

bzr init master
cd master
bzr ci -m "First commit" --unchanged
cd ..
bzr branch master new-branch
cd new-branch
bzr ci -m "New." --unchanged
bzr tag new-thing
cd ..
bzr checkout master master-checkout
cd master-checkout
bzr merge ../new-branch
echo "Tags in master-checkout:"
bzr tags
bzr ci -m "Commit in merge of new."
cd ../master
echo "Tags in master:"
bzr tags