Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 26996:bf3eec62212f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo.commit: switch to mergestate.read() See previous patches for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 13:58:50 -0800
parents a65ea44f163e
children 4414d500604f
line wrap: on
line diff
--- 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':