Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo.commit: switch to mergestate.read()
authorSiddharth Agarwal <sid0@fb.com>
Tue, 17 Nov 2015 13:58:50 -0800
changeset 26996 bf3eec62212f
parent 26995 d5a6be56970b
child 26997 1791f9aa782f
localrepo.commit: switch to mergestate.read() See previous patches for why we're doing this.
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Tue Nov 17 13:57:38 2015 -0800
+++ b/mercurial/localrepo.py	Tue Nov 17 13:58:50 2015 -0800
@@ -1556,7 +1556,7 @@
                 raise error.Abort(_("cannot commit merge with missing files"))
 
             unresolved, driverresolved = False, False
-            ms = mergemod.mergestate(self)
+            ms = mergemod.mergestate.read(self)
             for f in status.modified:
                 if f in ms:
                     if ms[f] == 'u':
mercurial