Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 25021 9a74b9919581
parent 25018 93e015a3d1ea
child 25114 d1d69ca78883 
--- a/mercurial/localrepo.py	Mon May 11 20:15:41 2015 -0700
+++ b/mercurial/localrepo.py	Tue May 12 11:44:14 2015 -0700
@@ -1462,7 +1462,7 @@
             cctx = context.workingcommitctx(self, status,
                                             text, user, date, extra)
 
-            allowemptycommit = (wctx.branch() != wctx.p1().branch() or force
+            allowemptycommit = (wctx.branch() != wctx.p1().branch()
                                 or extra.get('close') or merge or cctx.files()
                                 or self.ui.configbool('ui', 'allowemptycommit'))
             if not allowemptycommit:
mercurial