changeset 33455 | b1bc8cf3fea8 |
parent 31327 | e59960ea8dcc |
child 33487 | a050d37c2c70 |
--- a/hgext/convert/hg.py Tue Jul 11 01:05:27 2017 +0200 +++ b/hgext/convert/hg.py Tue Jul 11 00:59:23 2017 +0200 @@ -345,8 +345,8 @@ if commit.rev != node: ctx = self.repo[node] if ctx.phase() < phases.draft: - phases.retractboundary(self.repo, tr, phases.draft, - [ctx.node()]) + phases.registernew(self.repo, tr, phases.draft, + [ctx.node()]) text = "(octopus merge fixup)\n" p2 = node