Mercurial > public > mercurial-scm > hg-stable
diff hgext/transplant.py @ 45579: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 | 527ce85c2e60 |
line wrap: on
line diff
--- a/hgext/transplant.py Wed Sep 23 15:16:35 2020 +0200 +++ b/hgext/transplant.py Mon Sep 21 09:57:29 2020 -0700 @@ -198,9 +198,7 @@ if pulls: if source != repo: exchange.pull(repo, source.peer(), heads=pulls) - merge._update( - repo, pulls[-1], branchmerge=False, force=False - ) + merge.update(repo[pulls[-1]]) p1 = repo.dirstate.p1() pulls = [] @@ -275,7 +273,7 @@ tr.close() if pulls: exchange.pull(repo, source.peer(), heads=pulls) - merge._update(repo, pulls[-1], branchmerge=False, force=False) + merge.update(repo[pulls[-1]]) finally: self.saveseries(revmap, merges) self.transplants.write()