Mercurial > hg
diff hgext/rebase.py @ 45576:c1b603cdc95a
merge: add a higher-level update() for the common `hg update` use case
This is different from the `update()` function that I just made
private. The new function is specifically for the normal `hg update`
use case. It doesn't do a merge and it doesn't do a clean (forced)
update.
Differential Revision: https://phab.mercurial-scm.org/D9066
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 21 Sep 2020 09:57:29 -0700 |
parents | 2c86b9587740 |
children | 5c8230ca37f2 |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Sep 23 15:16:35 2020 +0200 +++ b/hgext/rebase.py Mon Sep 21 09:57:29 2020 -0700 @@ -642,13 +642,7 @@ cmdutil.bailifchanged(repo) self.inmemory = False self._assignworkingcopy() - mergemod._update( - repo, - p1, - branchmerge=False, - force=False, - wc=self.wctx, - ) + mergemod.update(repo[p1], wc=self.wctx) rebasenode( repo, rev,