equal
deleted
inserted
replaced
640 ) |
640 ) |
641 ) |
641 ) |
642 cmdutil.bailifchanged(repo) |
642 cmdutil.bailifchanged(repo) |
643 self.inmemory = False |
643 self.inmemory = False |
644 self._assignworkingcopy() |
644 self._assignworkingcopy() |
645 mergemod.update( |
645 mergemod._update( |
646 repo, |
646 repo, |
647 p1, |
647 p1, |
648 branchmerge=False, |
648 branchmerge=False, |
649 force=False, |
649 force=False, |
650 wc=self.wctx, |
650 wc=self.wctx, |
1515 if base is not None: |
1515 if base is not None: |
1516 repo.ui.debug(b" detach base %d:%s\n" % (base, repo[base])) |
1516 repo.ui.debug(b" detach base %d:%s\n" % (base, repo[base])) |
1517 |
1517 |
1518 # See explanation in merge.graft() |
1518 # See explanation in merge.graft() |
1519 mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node()) |
1519 mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node()) |
1520 stats = mergemod.update( |
1520 stats = mergemod._update( |
1521 repo, |
1521 repo, |
1522 rev, |
1522 rev, |
1523 branchmerge=True, |
1523 branchmerge=True, |
1524 force=True, |
1524 force=True, |
1525 ancestor=base, |
1525 ancestor=base, |