Patchwork [07,of,11] convert: use the new 'phase.registernew' function

login
register
mail settings
Submitter Boris Feld
Date July 14, 2017, 1:25 p.m.
Message ID <d331c624636b7c88f541.1500038741@FB>
Download mbox | patch
Permalink /patch/22324/
State Accepted
Headers show

Comments

Boris Feld - July 14, 2017, 1:25 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@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

Patch

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