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.
shelve: don't reimplement mergestate.unresolved()
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 01 Dec 2015 09:19:54 -0800
changeset 33313 ea03b3223611
parent 33312 b5612dbe72a3
child 33314 7d8d2da4516c
shelve: don't reimplement mergestate.unresolved()
hgext/shelve.py file | annotate | diff | comparison | revisions 
--- a/hgext/shelve.py	Mon Nov 23 09:37:12 2015 -0800
+++ b/hgext/shelve.py	Tue Dec 01 09:19:54 2015 -0800
@@ -659,7 +659,7 @@
     with repo.lock():
         checkparents(repo, state)
         ms = merge.mergestate.read(repo)
-        if [f for f in ms if ms[f] == 'u']:
+        if list(ms.unresolved()):
             raise error.Abort(
                 _("unresolved conflicts, can't continue"),
                 hint=_("see 'hg resolve', then 'hg unshelve --continue'"))
Mercurial