Index: trunk/scripts/git-migration/rules.mako
===================================================================
--- trunk/scripts/git-migration/rules.mako	(revision 1935)
+++ trunk/scripts/git-migration/rules.mako	(revision 1936)
@@ -47,4 +47,17 @@
     }
 
+    quashes = [
+        ('/package_tags/sipb-xen-dev/sipb-xen-dev/', 11),
+        ('/package_tags/sipb-xen-dev/13/', 316),
+        ('/package_tags/sipb-xen-console/2/', 347),
+        ('/package_tags/sipb-xen-console/2/sipb-xen-console/', 348),
+        ('/package_tags/sipb-xen-console/2/', 349),
+        ('/package_tags/sipb-xen-console/7.1/sipb-xen-console/', 401),
+        ('/package_tags/sipb-xen-guest-installer/1.0/sipb-xen-guest-installer/', 452),
+        ('/package_tags/sipb-xen-dev/14/sipb-xen-dev/', 462),
+        ('/package_tags/sipb-xen-dev/14/', 463),
+        ('/trunk/packages/sipb-xen-autoinstaller/', 742),
+    ]
+
     merges = []
     for line in open('merges'):
@@ -90,36 +103,10 @@
 % endfor
 
-match /package_tags/sipb-xen-dev/sipb-xen-dev/
-end match
-
-match /package_tags/sipb-xen-dev/13/
-  min revision 316
-  max revision 316
-end match
-
-match /package_tags/sipb-xen-console/2/
-  min revision 347
-  max revision 349
-end match
-
-match /package_tags/sipb-xen-console/7.1/sipb-xen-console/
-  min revision 401
-  max revision 401
-end match
-
-match /package_tags/sipb-xen-guest-installer/1.0/sipb-xen-guest-installer/
-  min revision 452
-  max revision 452
-end match
-
-match /package_tags/sipb-xen-dev/14/sipb-xen-dev(/|$)
-  min revision 462
-  max revision 463
-end match
-
-match /trunk/packages/sipb-xen-autoinstaller/
-  min revision 742
-  max revision 742
-end match
+% for quash in quashes:
+match ${quash[0]}
+  min revision ${quash[1]}
+  max revision ${quash[1]}
+end match
+% endfor
 
 % for package in packages: