##// END OF EJS Templates
convert: use the new 'phase.registernew' function
Boris Feld -
r33455:b1bc8cf3 default
parent child Browse files
Show More
@@ -345,8 +345,8 b' class mercurial_sink(common.converter_si'
345 if commit.rev != node:
345 if commit.rev != node:
346 ctx = self.repo[node]
346 ctx = self.repo[node]
347 if ctx.phase() < phases.draft:
347 if ctx.phase() < phases.draft:
348 phases.retractboundary(self.repo, tr, phases.draft,
348 phases.registernew(self.repo, tr, phases.draft,
349 [ctx.node()])
349 [ctx.node()])
350
350
351 text = "(octopus merge fixup)\n"
351 text = "(octopus merge fixup)\n"
352 p2 = node
352 p2 = node
General Comments 0
You need to be logged in to leave comments. Login now