More fixups.

svn path=/trunk/scripts/git-migration/; revision=1914

diff --git a/rules.mako b/rules.mako
index 921a25e..120302e 100644 (file)
--- a/rules.mako
+++ b/rules.mako
@@ -5,6 +5,7 @@
     packages = [package[len('packages/'):] for package in packages]
 
     doubled_packages = {
     packages = [package[len('packages/'):] for package in packages]
 
     doubled_packages = {

+        'sipb-xen-guest-installer': (310, 310),

         'sipb-xen-base': (314, 315),
         'sipb-xen-database': (311, 313),
         'sipb-xen-dev': (314, 315),
         'sipb-xen-base': (314, 315),
         'sipb-xen-database': (311, 313),
         'sipb-xen-dev': (314, 315),

@@ -13,8 +14,12 @@
     }
 
     punt = {
     }
 
     punt = {

+        'xvm-console-devconfig': 700,

         'sipb-xen-guest-installer': 742,
         'sipb-xen-guest-installer': 742,

+        'sipb-xen-remote-server': 1176,

         'sipb-xen-dns': 1184,
         'sipb-xen-dns': 1184,

+        'sipb-xen-console-server': 1187,
+        'sipb-xen-console': 1201,

         'sipb-xen-base': 1350,
         'sipb-xen-chrony-config': 1351,
         'sipb-xen-database': 1352,
         'sipb-xen-base': 1350,
         'sipb-xen-chrony-config': 1351,
         'sipb-xen-database': 1352,

@@ -32,6 +37,8 @@
         'sipb-xen-clvm-config': 1569,
         'invirt-console-host': 1816,
         'invirt-console-server': 1816,
         'sipb-xen-clvm-config': 1569,
         'invirt-console-host': 1816,
         'invirt-console-server': 1816,

+        'invirt-remote-host': 1822,
+        'invirt-remote-server': 1822,

     }
 
     merges = []
     }
 
     merges = []

@@ -80,6 +87,26 @@ end repository
 match /package_tags/sipb-xen-dev/sipb-xen-dev(/|$)
 end match
 
 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(/|$)
+  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
 match /trunk/packages/sipb-xen-autoinstaller(/|$)
   min revision 742
   max revision 742

@@ -109,9 +136,13 @@ match /package_tags/${package}/([^/~]+)/${package}(/|$)
 end match
 
 match /trunk/packages/tmp/${package}(/|$)
 end match
 
 match /trunk/packages/tmp/${package}(/|$)

-  repository ${get_repo(package)}
-  branch ${get_branch(package)}
-  max revision ${doubled_packages[package][1] - 1}
+  min revision ${doubled_packages[package][0]}
+  max revision ${doubled_packages[package][0]}
+end match
+
+match /trunk/packages/${package}(/|$)
+  min revision ${doubled_packages[package][1]}
+  max revision ${doubled_packages[package][1]}

 end match
 % endif
 
 end match
 % endif
 

@@ -119,7 +150,7 @@ match /trunk/packages/${package}(/|$)
   repository ${get_repo(package)}
   branch ${get_branch(package)}
 % if package in doubled_packages:
   repository ${get_repo(package)}
   branch ${get_branch(package)}
 % if package in doubled_packages:

-  min revision ${doubled_packages[package][1]}
+  min revision ${doubled_packages[package][1] + 1}

 % endif
 % if package in punt:
   max revision ${punt[package] - 1}
 % endif
 % if package in punt:
   max revision ${punt[package] - 1}

@@ -159,7 +190,7 @@ end match
 match /trunk/web(/|$)
   repository ${get_repo('sipb-xen-www')}
   branch ${get_branch('sipb-xen-www')}
 match /trunk/web(/|$)
   repository ${get_repo('sipb-xen-www')}
   branch ${get_branch('sipb-xen-www')}

-  max revision 302
+  max revision 303

 end match
 
 match /trunk/vnc/tightvnc-1.3.9_javasrc.zip
 end match
 
 match /trunk/vnc/tightvnc-1.3.9_javasrc.zip

@@ -168,11 +199,13 @@ end match
 match /trunk/vnc/vnc_javasrc(/|$)
   repository ${get_repo('sipb-xen-vnc-client')}
   branch ${get_branch('sipb-xen-vnc-client')}
 match /trunk/vnc/vnc_javasrc(/|$)
   repository ${get_repo('sipb-xen-vnc-client')}
   branch ${get_branch('sipb-xen-vnc-client')}

+  max revision 304

 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/vnc/vnc_server(/|$)
   repository ${get_repo('sipb-xen-vnc-server')}
   branch ${get_branch('sipb-xen-vnc-server')}

+  max revision 286

 end match
 
 match /trunk/(dns|scripts|vmctl)(/|$)
 end match
 
 match /trunk/(dns|scripts|vmctl)(/|$)