Index: trunk/scripts/git-migration/rules.mako
===================================================================
--- trunk/scripts/git-migration/rules.mako	(revision 1905)
+++ trunk/scripts/git-migration/rules.mako	(revision 1906)
@@ -5,5 +5,15 @@
     packages = [package[len('packages/'):] for package in packages]
 
+    doubled_packages = {
+        'sipb-xen-base': (314, 315),
+        'sipb-xen-database': (311, 313),
+        'sipb-xen-dev': (314, 315),
+        'sipb-xen-dom0': (314, 315),
+        'sipb-xen-remctl-auto': (314, 315),
+    }
+
     punt = {
+        'sipb-xen-guest-installer': 742,
+        'sipb-xen-dns': 1184,
         'sipb-xen-base': 1350,
         'sipb-xen-chrony-config': 1351,
@@ -71,9 +81,24 @@
 end match
 
+match /trunk/packages/sipb-xen-autoinstaller(/|$)
+  min revision 742
+  max revision 742
+end match
+
 % for package in packages:
+
+% if package == 'sipb-xen-database':
+match /trunk/packages/${package}/${package}-0(/|$)
+  repository ${get_repo(package)}
+  branch ${get_branch(package)}
+  max revision 8
+end match
+% endif
+
+% if package in doubled_packages:
 match /trunk/packages/${package}/${package}(/|$)
   repository ${get_repo(package)}
   branch ${get_branch(package)}
-  max revision 317
+  max revision ${doubled_packages[package][0] - 1}
 end match
 
@@ -81,9 +106,20 @@
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
+  max revision ${doubled_packages[package][0] - 1}
 end match
+
+match /trunk/packages/tmp/${package}(/|$)
+  repository ${get_repo(package)}
+  branch ${get_branch(package)}
+  max revision ${doubled_packages[package][1] - 1}
+end match
+% endif
 
 match /trunk/packages/${package}(/|$)
   repository ${get_repo(package)}
   branch ${get_branch(package)}
+% if package in doubled_packages:
+  min revision ${doubled_packages[package][1]}
+% endif
 % if package in punt:
   max revision ${punt[package] - 1}
@@ -94,4 +130,7 @@
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
+% if package in doubled_packages:
+  min revision ${doubled_packages[package][1]}
+% endif
 end match
 
@@ -99,4 +138,7 @@
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1_\2
+% if package in doubled_packages:
+  min revision ${doubled_packages[package][1]}
+% endif
 end match
 
@@ -107,9 +149,4 @@
 
 match /package_tags/(xen-common|xen-3.1)(/|$)
-end match
-
-match /trunk/packages/tmp(/|$)
-  repository ${get_repo('sipb-xen-database')}
-  branch ${get_branch('sipb-xen-database')}
 end match
 
@@ -123,4 +160,5 @@
   repository ${get_repo('sipb-xen-www')}
   branch ${get_branch('sipb-xen-www')}
+  max revision 302
 end match