Comment 18 for bug 152008

I have the same exact problem. It was surprising to me to get a "Nothing to do." in the last merge of this sequence, as the code is obviously different and there are tons of things to do:

$ cd staging
$ bzr merge ../trunk
(...)
r1516

# oops, that was a mistake, too soon, let me revert
$ bzr revert -r 1515; bzr commit -m "revert -r 1515"

# days later, now we can merge
$ bzr merge ../trunk
Nothing to do.

The same happens if instead of a "bzr revert" I do "bzr merge -r 1516..1515 .".