Index: trunk/scripts/git-migration/rules.mako
===================================================================
--- trunk/scripts/git-migration/rules.mako	(revision 1922)
+++ trunk/scripts/git-migration/rules.mako	(revision 1931)
@@ -90,18 +90,18 @@
 % endfor
 
-match /package_tags/sipb-xen-dev/sipb-xen-dev(/|$)
-end match
-
-match /package_tags/sipb-xen-console/2(/|$)
+match /package_tags/sipb-xen-dev/sipb-xen-dev/
+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(/|$)
+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(/|$)
+match /package_tags/sipb-xen-guest-installer/1.0/sipb-xen-guest-installer/
   min revision 452
   max revision 452
@@ -113,5 +113,5 @@
 end match
 
-match /trunk/packages/sipb-xen-autoinstaller(/|$)
+match /trunk/packages/sipb-xen-autoinstaller/
   min revision 742
   max revision 742
@@ -121,5 +121,5 @@
 
 % if package == 'sipb-xen-database':
-match /trunk/packages/${package}/${package}-0(/|$)
+match /trunk/packages/${package}/${package}-0/
   repository ${get_repo(package)}
   branch ${get_branch(package)}
@@ -129,5 +129,5 @@
 
 % if package in doubled_packages:
-match /trunk/packages/${package}/${package}(/|$)
+match /trunk/packages/${package}/${package}/
   repository ${get_repo(package)}
   branch ${get_branch(package)}
@@ -135,5 +135,5 @@
 end match
 
-match /package_tags/${package}/([^/~]+)/${package}(/|$)
+match /package_tags/${package}/([^/~]+)/${package}/
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
@@ -141,10 +141,10 @@
 end match
 
-match /trunk/packages/tmp/${package}(/|$)
+match /trunk/packages/tmp/${package}/
   min revision ${doubled_packages[package][0]}
   max revision ${doubled_packages[package][0]}
 end match
 
-match /trunk/packages/${package}(/|$)
+match /trunk/packages/${package}/
   min revision ${doubled_packages[package][1]}
   max revision ${doubled_packages[package][1]}
@@ -152,5 +152,5 @@
 % endif
 
-match /trunk/packages/${package}(/|$)
+match /trunk/packages/${package}/
   repository ${get_repo(package)}
   branch ${get_branch(package)}
@@ -163,5 +163,5 @@
 end match
 
-match /package_tags/${package}/([^/~]+)(/|$)
+match /package_tags/${package}/([^/~]+)/
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
@@ -171,5 +171,5 @@
 end match
 
-match /package_tags/${package}/([^/~]+)~([^/~]+)(/|$)
+match /package_tags/${package}/([^/~]+)~([^/~]+)/
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1_\2
@@ -181,11 +181,11 @@
 % endfor
 
-match /trunk/packages/(xen-common|xen-3.1)(/|$)
-end match
-
-match /package_tags/(xen-common|xen-3.1)(/|$)
-end match
-
-match /trunk/dhcp(/|$)
+match /trunk/packages/(xen-common|xen-3.1)/
+end match
+
+match /package_tags/(xen-common|xen-3.1)/
+end match
+
+match /trunk/dhcp/
   repository ${get_repo('sipb-xen-dhcp')}
   branch ${get_branch('sipb-xen-dhcp')}
@@ -202,5 +202,5 @@
 end match
 
-match /trunk/vnc/vnc_javasrc(/|$)
+match /trunk/vnc/vnc_javasrc/
   repository ${get_repo('sipb-xen-vnc-client')}
   branch ${get_branch('sipb-xen-vnc-client')}
@@ -214,5 +214,5 @@
 end match
 
-match /trunk/dns(/|$)
+match /trunk/dns/
   repository ${get_repo('sipb-xen-dns')}
   branch dns
@@ -221,5 +221,5 @@
 
 % for script in scripts:
-match /trunk/scripts/${script}(/|$)
+match /trunk/scripts/${script}/
   repository scripts/${script}.git
   branch master
@@ -227,5 +227,5 @@
 % endfor
 
-match /trunk/scripts(/|$)
+match /trunk/scripts/
   repository scripts/osx-update.git
   branch master
@@ -234,5 +234,5 @@
 end match
 
-match /trunk/scripts(/|$)
+match /trunk/scripts/
   repository scripts/prod-migration.git
   branch master
@@ -241,5 +241,5 @@
 
 % for rev in [803, 804, 925, 926, 928, 1537, 1566]:
-match /trunk(/|$)
+match /trunk/
   repository doc/xvm.git
   branch master
@@ -249,5 +249,5 @@
 % endfor
 
-match /trunk/vmctl(/|$)
+match /trunk/vmctl/
 end match
 
@@ -255,4 +255,4 @@
 end match
 
-match /branches/wsgi(/|$)
-end match
+match /branches/wsgi/
+end match