Mercurial > evolve
changeset 5736:f39fd921ecba
branching: merge stable into default
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 30 Jan 2021 20:20:21 +0800 |
| parents | 572b3f3c4a29 (current diff) 3fb72f8c66e7 (diff) |
| children | 0c6bb79da287 ad80552c706c |
| files | CHANGELOG hgext3rd/evolve/headchecking.py |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Thu Jan 28 18:29:53 2021 +0800 +++ b/CHANGELOG Sat Jan 30 20:20:21 2021 +0800 @@ -4,12 +4,17 @@ 10.1.1 -- in progress --------------------- + * doc: update the MQ To Evolve guide and fix build warning for index.rst + * evolve: remove spurious "working directory is now at ..." messages * evolve: various documentation improvements + * packaging: default to building docs on Python 3 + topic: - * rebase: prevent in-memory rebase to silently drop topic (by disable the feature) + * rebase: prevent in-memory rebase from silently dropping topic (by disabling + the feature) 10.2.0 - in progress --------------------
--- a/hgext3rd/evolve/headchecking.py Thu Jan 28 18:29:53 2021 +0800 +++ b/hgext3rd/evolve/headchecking.py Sat Jan 30 20:20:21 2021 +0800 @@ -166,7 +166,7 @@ new_heads.sort() return new_heads -def enforcesinglehead(orig, repo, tr, desc, accountclosed, filtername=b'visible'): +def enforcesinglehead(orig, repo, tr, desc, accountclosed=False, filtername=b'visible'): """check that no named branch has multiple heads COMPAT: this is the same as the upstream version as of c701f616d852, except