# HG changeset patch
# User Boris Feld <boris.f...@octobus.net>
# Date 1499727563 -7200
# Tue Jul 11 00:59:23 2017 +0200
# Node ID d331c624636b7c88f54170c7d600e6d4480aa23b
# Parent 210688a668f0ff9f8395b2789b29fdb2a1de2c64
# EXP-Topic tr.changes.phases
convert: use the new 'phase.registernew' function
diff -r 210688a668f0 -r d331c624636b hgext/convert/hg.py
--- 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
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
