Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hg.py @ 45562:03726f5b6092
merge: use merge.clean_update() when applicable
We have had this higher-level function (higher than `merge.update()`,
that is) for a while. Let's simply some callers by using it. I don't
know why I didn't do this when I introduced the function.
After this patch, there are no remaining callers that call
`hg.updaterepo()` with `overwrite=True`. We'll clean that up soon.
Differential Revision: https://phab.mercurial-scm.org/D9063
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 21 Sep 2020 10:09:39 -0700 |
| parents | b71858b42963 |
| children | 2c86b9587740 |
line wrap: on
line diff
--- a/mercurial/hg.py Fri Sep 18 15:03:06 2020 -0700 +++ b/mercurial/hg.py Mon Sep 21 10:09:39 2020 -0700 @@ -1074,7 +1074,7 @@ def clean(repo, node, show_stats=True, quietempty=False): """forcibly switch the working directory to node, clobbering changes""" - stats = updaterepo(repo, node, True) + stats = mergemod.clean_update(repo[node]) assert stats.unresolvedcount == 0 if show_stats: _showstats(repo, stats, quietempty)