--- a/hgext/mq.py	Sun Nov 19 16:32:36 2006 -0600
+++ b/hgext/mq.py	Sun Nov 19 23:47:19 2006 +0100
@@ -1794,7 +1794,8 @@
     if ui.verbose:
         ui.write('Renaming %s to %s\n' % (patch, name))
     i = q.find_series(patch)
-    q.full_series[i] = name
+    guards = q.guard_re.findall(q.full_series[i])
+    q.full_series[i] = name + ''.join([' #' + g for g in guards])
     q.parse_series()
     q.series_dirty = 1