Index: trunk/scripts/git-migration/rules.mako
===================================================================
--- trunk/scripts/git-migration/rules.mako	(revision 1904)
+++ trunk/scripts/git-migration/rules.mako	(revision 1905)
@@ -4,4 +4,24 @@
     repos = packages
     packages = [package[len('packages/'):] for package in packages]
+
+    punt = {
+        'sipb-xen-base': 1350,
+        'sipb-xen-chrony-config': 1351,
+        'sipb-xen-database': 1352,
+        'sipb-xen-dev': 1353,
+        'sipb-xen-dom0': 1354,
+        'sipb-xen-host-master': 1355,
+        'sipb-xen-iptables': 1356,
+        'sipb-xen-python-pydhcplib': 1357,
+        'sipb-xen-remctl-auto': 1358,
+        'sipb-xen-vnc-client': 1359,
+        'sipb-xen-www': 1360,
+        'sipb-xen-vnc-server': 1387,
+        'sipb-xen-dhcp': 1436,
+        'sipb-xen-autoinstaller': 1569,
+        'sipb-xen-clvm-config': 1569,
+        'invirt-console-host': 1816,
+        'invirt-console-server': 1816,
+    }
 
     merges = []
@@ -48,29 +68,33 @@
 % endfor
 
-match /package_tags/sipb-xen-dev/sipb-xen-dev/
+match /package_tags/sipb-xen-dev/sipb-xen-dev(/|$)
 end match
 
 % for package in packages:
-match /trunk/packages/${package}/${package}/
+match /trunk/packages/${package}/${package}(/|$)
   repository ${get_repo(package)}
   branch ${get_branch(package)}
+  max revision 317
 end match
 
-match /package_tags/${package}/([^/~]+)/${package}/
+match /package_tags/${package}/([^/~]+)/${package}(/|$)
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
 end match
 
-match /trunk/packages/${package}/
+match /trunk/packages/${package}(/|$)
   repository ${get_repo(package)}
   branch ${get_branch(package)}
+% if package in punt:
+  max revision ${punt[package] - 1}
+% endif
 end match
 
-match /package_tags/${package}/([^/~]+)/
+match /package_tags/${package}/([^/~]+)(/|$)
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
 end match
 
-match /package_tags/${package}/([^/~]+)~([^/~]+)/
+match /package_tags/${package}/([^/~]+)~([^/~]+)(/|$)
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1_\2
@@ -79,16 +103,40 @@
 % endfor
 
-match /trunk/packages/(xen-common|xen-3.1)/
+match /trunk/packages/(xen-common|xen-3.1)(/|$)
 end match
 
-match /package_tags/(xen-common|xen-3.1)/
+match /package_tags/(xen-common|xen-3.1)(/|$)
 end match
 
-match /trunk/packages/tmp/
+match /trunk/packages/tmp(/|$)
   repository ${get_repo('sipb-xen-database')}
   branch ${get_branch('sipb-xen-database')}
 end match
 
-match /trunk/(dhcp|dns|scripts|vnc|web|vmctl)/
+match /trunk/dhcp(/|$)
+  repository ${get_repo('sipb-xen-dhcp')}
+  branch ${get_branch('sipb-xen-dhcp')}
+  max revision 281
+end match
+
+match /trunk/web(/|$)
+  repository ${get_repo('sipb-xen-www')}
+  branch ${get_branch('sipb-xen-www')}
+end match
+
+match /trunk/vnc/tightvnc-1.3.9_javasrc.zip
+end match
+
+match /trunk/vnc/vnc_javasrc(/|$)
+  repository ${get_repo('sipb-xen-vnc-client')}
+  branch ${get_branch('sipb-xen-vnc-client')}
+end match
+
+match /trunk/vnc/vnc_server(/|$)
+  repository ${get_repo('sipb-xen-vnc-server')}
+  branch ${get_branch('sipb-xen-vnc-server')}
+end match
+
+match /trunk/(dns|scripts|vmctl)(/|$)
 end match
 
@@ -96,4 +144,4 @@
 end match
 
-match /branches/wsgi/
+match /branches/wsgi(/|$)
 end match