| changeset 45576 | c1b603cdc95a |
| parent 45557 | 2c86b9587740 |
| child 45577 | 5c8230ca37f2 |
| 45575:147fb889278b | 45576:c1b603cdc95a |
|---|---|
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(repo[p1], wc=self.wctx) |
646 repo, |
|
647 p1, |
|
648 branchmerge=False, |
|
649 force=False, |
|
650 wc=self.wctx, |
|
651 ) |
|
652 rebasenode( |
646 rebasenode( |
653 repo, |
647 repo, |
654 rev, |
648 rev, |
655 p1, |
649 p1, |
656 p2, |
650 p2, |