--- a/hgext/shelve.py	Thu Oct 02 18:50:41 2014 -0500
+++ b/hgext/shelve.py	Wed Sep 24 17:18:57 2014 -0700
@@ -401,8 +401,7 @@
         files.extend(shelvectx.parents()[0].files())
 
         # revert will overwrite unknown files, so move them out of the way
-        m, a, r, d, u = repo.status(unknown=True)[:5]
-        for file in u:
+        for file in repo.status(unknown=True)[4]:
             if file in files:
                 util.rename(file, file + ".orig")
         ui.pushbuffer(True)