On 03/06/16 23:50, R. David Murray wrote:
I don't understand how it happened, but apparently I got a merge commit backward and merged 3.6 into 3.5 and pushed it without realizing what had happened. If anyone has any clue how to reverse this cleanly, please let me know. (There are a couple people at the sprints looking in to it, but the mercurial guys aren't here so we are short on experts).
Bed time in Spain (hours ago, actually), but I think you could just "rollback" the merge commit with a regular "hg help revert" or "hg help backout".