changeset 45084 | 07b3166e94ca |
parent 45065 | b8f4ead9fa49 |
child 45088 | 3e40abe0a170 |
--- a/mercurial/localrepo.py Mon Jul 13 13:06:12 2020 -0400 +++ b/mercurial/localrepo.py Fri Jul 10 00:44:18 2020 +0200 @@ -2996,7 +2996,7 @@ # internal config: ui.allowemptycommit allowemptycommit = ( - wctx.branch() != wctx.p1().branch() + cctx.branch() != cctx.p1().branch() or extra.get(b'close') or merge or cctx.files()