Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands.resolve: switch to mergestate.read()
authorSiddharth Agarwal <sid0@fb.com>
Tue, 17 Nov 2015 13:56:46 -0800
changeset 26993 d240ae897ba6
parent 26992 b3b5ed560283
child 26994 676c3838d217
commands.resolve: switch to mergestate.read() See previous patches for why we're doing this.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Tue Nov 17 13:56:10 2015 -0800
+++ b/mercurial/commands.py	Tue Nov 17 13:56:46 2015 -0800
@@ -5589,7 +5589,7 @@
 
     if show:
         fm = ui.formatter('resolve', opts)
-        ms = mergemod.mergestate(repo)
+        ms = mergemod.mergestate.read(repo)
         m = scmutil.match(repo[None], pats, opts)
         for f in ms:
             if not m(f):
@@ -5604,7 +5604,7 @@
 
     wlock = repo.wlock()
     try:
-        ms = mergemod.mergestate(repo)
+        ms = mergemod.mergestate.read(repo)
 
         if not (ms.active() or repo.dirstate.p2() != nullid):
             raise error.Abort(
Mercurial