Mercurial > public > mercurial-scm > hg
diff hgext/rebase.py @ 45577:5c8230ca37f2
merge: replace calls to hg.updaterepo() by merge.update()
The former no longer buys us anything.
Differential Revision: https://phab.mercurial-scm.org/D9067
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 21 Sep 2020 11:53:44 -0700 |
| parents | c1b603cdc95a |
| children | b4c193509cd0 1d5189a57405 |
line wrap: on
line diff
--- a/hgext/rebase.py Mon Sep 21 09:57:29 2020 -0700 +++ b/hgext/rebase.py Mon Sep 21 11:53:44 2020 -0700 @@ -34,7 +34,6 @@ dirstateguard, error, extensions, - hg, merge as mergemod, mergestate as mergestatemod, mergeutil, @@ -750,7 +749,7 @@ newwd = self.originalwd if newwd not in [c.rev() for c in repo[None].parents()]: ui.note(_(b"update back to initial working directory parent\n")) - hg.updaterepo(repo, newwd, overwrite=False) + mergemod.update(repo[newwd]) collapsedas = None if self.collapsef and not self.keepf: