Mercurial Mercurial > hg-stable / 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.
shelve: switch to mergestate.read()
authorSiddharth Agarwal <sid0@fb.com>
Tue, 17 Nov 2015 13:56:10 -0800
changeset 26992 b3b5ed560283
parent 26991 2ddc92bae4a7
child 26993 d240ae897ba6
shelve: switch to mergestate.read() See previous patches for why we're doing this.
hgext/shelve.py file | annotate | diff | comparison | revisions 
--- a/hgext/shelve.py	Tue Nov 17 13:55:30 2015 -0800
+++ b/hgext/shelve.py	Tue Nov 17 13:56:10 2015 -0800
@@ -531,7 +531,7 @@
     lock = None
     try:
         checkparents(repo, state)
-        ms = merge.mergestate(repo)
+        ms = merge.mergestate.read(repo)
         if [f for f in ms if ms[f] == 'u']:
             raise error.Abort(
                 _("unresolved conflicts, can't continue"),
hg-stable