--- a/hgext/mq.py	Fri Oct 16 00:06:23 2009 +0200
+++ b/hgext/mq.py	Fri Oct 16 00:45:18 2009 +0200
@@ -997,6 +997,8 @@
                 self.ui.warn(_('done\n'))
                 raise
 
+            if not self.applied:
+                return ret[0]
             top = self.applied[-1].name
             if ret[0] and ret[0] > 1:
                 msg = _("errors during apply, please fix and refresh %s\n")
@@ -2618,7 +2620,7 @@
         (pop,
          [('a', 'all', None, _('pop all patches')),
           ('n', 'name', '', _('queue name to pop')),
-          ('f', 'force', None, _('forget any local changes'))],
+          ('f', 'force', None, _('forget any local changes to patched files'))],
          _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')),
     "^qpush":
         (push,