equal
deleted
inserted
replaced
32 copies, |
32 copies, |
33 destutil, |
33 destutil, |
34 dirstateguard, |
34 dirstateguard, |
35 error, |
35 error, |
36 extensions, |
36 extensions, |
37 hg, |
|
38 merge as mergemod, |
37 merge as mergemod, |
39 mergestate as mergestatemod, |
38 mergestate as mergestatemod, |
40 mergeutil, |
39 mergeutil, |
41 node as nodemod, |
40 node as nodemod, |
42 obsolete, |
41 obsolete, |
748 if newwd < 0: |
747 if newwd < 0: |
749 # original directory is a parent of rebase set root or ignored |
748 # original directory is a parent of rebase set root or ignored |
750 newwd = self.originalwd |
749 newwd = self.originalwd |
751 if newwd not in [c.rev() for c in repo[None].parents()]: |
750 if newwd not in [c.rev() for c in repo[None].parents()]: |
752 ui.note(_(b"update back to initial working directory parent\n")) |
751 ui.note(_(b"update back to initial working directory parent\n")) |
753 hg.updaterepo(repo, newwd, overwrite=False) |
752 mergemod.update(repo[newwd]) |
754 |
753 |
755 collapsedas = None |
754 collapsedas = None |
756 if self.collapsef and not self.keepf: |
755 if self.collapsef and not self.keepf: |
757 collapsedas = newnode |
756 collapsedas = newnode |
758 clearrebased( |
757 clearrebased( |