equal
deleted
inserted
replaced
343 # draft, set it back to draft since it hasn't been exposed |
343 # draft, set it back to draft since it hasn't been exposed |
344 # anywhere. |
344 # anywhere. |
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 |
353 |
353 |
354 if self.filemapmode and nparents == 1: |
354 if self.filemapmode and nparents == 1: |