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 18660 7e6946ed5756
parent 18659 b946470efed9
child 18661 4fb92f14a97a 
--- a/mercurial/localrepo.py	Fri Feb 08 05:36:07 2013 -0800
+++ b/mercurial/localrepo.py	Fri Feb 08 05:36:08 2013 -0800
@@ -1233,11 +1233,11 @@
             cctx = context.workingctx(self, text, user, date, extra, changes)
 
             if (not force and not extra.get("close") and not merge
-                and not (changes[0] or changes[1] or changes[2])
+                and not cctx.files()
                 and wctx.branch() == wctx.p1().branch()):
                 return None
 
-            if merge and changes[3]:
+            if merge and cctx.deleted():
                 raise util.Abort(_("cannot commit merge with missing files"))
 
             ms = mergemod.mergestate(self)
mercurial