Mercurial > public > mercurial-scm > hg-stable
diff relnotes/next @ 44429:ddbc296a1f48
merge: drop redundant mergeforce argument from hg.merge()
The only caller that passed a value for either `force` or `mergeforce`
passed the same value for both, so let's simplify the interface by
accepting only `force`.
Differential Revision: https://phab.mercurial-scm.org/D8167
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 26 Feb 2020 11:00:50 -0800 |
| parents | acbfa31cfaf2 |
| children | edc8504bc26b |
line wrap: on
line diff
--- a/relnotes/next Wed Feb 26 10:54:17 2020 -0800 +++ b/relnotes/next Wed Feb 26 11:00:50 2020 -0800 @@ -65,5 +65,8 @@ * `hg.merge()` has lost its `abort` argument. Please call `hg.abortmerge()` directly instead. + * `hg.merge()` has lost its `mergeforce` argument. It should have + only ever been called with the same value as the `force` argument. + * The `*others` argument of `cmdutil.check_incompatible_arguments()` changed from being varargs argument to being a single collection.