diff hgext/mq.py @ 14052:ecaa78594983

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 30 Apr 2011 03:44:31 -0500
parents 4f19242dac6c 2b1226693c70
children 3c616f512a5b
line wrap: on
line diff
--- a/hgext/mq.py	Sat Apr 30 03:00:38 2011 -0500
+++ b/hgext/mq.py	Sat Apr 30 03:44:31 2011 -0500
@@ -852,7 +852,7 @@
                 raise util.Abort(_("local changes found"))
         return m, a, r, d
 
-    _reserved = ('series', 'status', 'guards')
+    _reserved = ('series', 'status', 'guards', '.', '..')
     def check_reserved_name(self, name):
         if (name in self._reserved or name.startswith('.hg')
             or name.startswith('.mq') or '#' in name or ':' in name):