Mercurial > public > mercurial-scm > hg
diff hgext/histedit.py @ 44270:f546d2170b0f
merge: introduce a clean_update() for that use-case
I find it hard to understand what value to pass for all the arguments
to `merge.update()`. I would like to introduce functions that are more
specific to each use-case. We already have `graft()`. This patch
introduces a `clean_update()` and uses it in some places to show that
it works.
Differential Revision: https://phab.mercurial-scm.org/D7902
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 15 Jan 2020 15:30:25 -0800 |
| parents | cb8b67016110 |
| children | d543ef183eb8 |
line wrap: on
line diff
--- a/hgext/histedit.py Wed Feb 05 16:16:15 2020 -0500 +++ b/hgext/histedit.py Wed Jan 15 15:30:25 2020 -0800 @@ -945,7 +945,7 @@ class base(histeditaction): def run(self): if self.repo[b'.'].node() != self.node: - mergemod.update(self.repo, self.node, branchmerge=False, force=True) + mergemod.clean_update(self.repo[self.node]) return self.continueclean() def continuedirty(self):