Hg merge -> revert -> merge

Question

I've stuck with a small Mercurial problem: I merged a branch A into a branch B and everything succeeded, but after that one of my teammates reverted the branch B back to pre-merge status. Now I need to merge branch A once again into branch B, but I get the following error:

abort: merging with a working directory ancestor has no effect

How to solve the problem?

Answer 1

您可以撤消还原分支B的修订。这将创建具有在“还原”变更集中应用的反向修改的新变更集。