Comment 5 for bug 266897

Jelmer: I don't understand how a merge can reorder the mainline?

Anyway, what's in my branch at the moment seems to fix this bug - there are test failures, but I suspect they're just in need of updating the expected output.

This is somewhat blocked on figuring out what to do with the skip_full_merged (not --always-rebase-merges) mode, which has gone from being broken in the sense of skipping too much to being broken in the sense of now skipping nothing at all. I've started a thread on the Bazaar ML entitled "bzr rebase: Change behaviour to be as if --always-rebase-merges specified, remove outright the current default mode".