Mercurial > hg-stable
changeset 33455:b1bc8cf3fea8
convert: use the new 'phase.registernew' function
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 11 Jul 2017 00:59:23 +0200 |
parents | 3c20d7ef42e1 |
children | ae052d04b89e |
files | hgext/convert/hg.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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