Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hg.py @ 44428:0f60687b2324
merge: change default of hg.merge()'s "force" argument from None to False
The argument is only passed to `mergemode.update()`, and that function
treats `None` just like `False`, so `False` seems clearer.
Differential Revision: https://phab.mercurial-scm.org/D8166
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 26 Feb 2020 10:54:17 -0800 |
| parents | 3245cdea2c63 |
| children | ddbc296a1f48 |
comparison
equal
deleted
inserted
replaced
| 44427:acbfa31cfaf2 | 44428:0f60687b2324 |
|---|---|
| 1135 | 1135 |
| 1136 return ret | 1136 return ret |
| 1137 | 1137 |
| 1138 | 1138 |
| 1139 def merge( | 1139 def merge( |
| 1140 repo, node, force=None, remind=True, mergeforce=False, labels=None, | 1140 repo, node, force=False, remind=True, mergeforce=False, labels=None, |
| 1141 ): | 1141 ): |
| 1142 """Branch merge with node, resolving changes. Return true if any | 1142 """Branch merge with node, resolving changes. Return true if any |
| 1143 unresolved conflicts.""" | 1143 unresolved conflicts.""" |
| 1144 stats = mergemod.update( | 1144 stats = mergemod.update( |
| 1145 repo, | 1145 repo, |