Update the git-migration.

Include two new packages and ignore a botched branch creation.

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

diff --git a/svn.yml b/svn.yml
index cb4f050..2bacda0 100644 (file)
--- a/svn.yml
+++ b/svn.yml
@@ -30,6 +30,7 @@ packages:
   invirt-web-iptables: {}
   invirt-xen-config: {}
   libapache2-mod-auth-sslcert: {}
   invirt-web-iptables: {}
   invirt-xen-config: {}
   libapache2-mod-auth-sslcert: {}

+  python-afs: {}

   python-pydhcplib: {}
   python-routefs: {}
   sipb-xen-autoinstaller:
   python-pydhcplib: {}
   python-routefs: {}
   sipb-xen-autoinstaller:

@@ -72,6 +73,7 @@ packages:
     {punt: 1387, merge: invirt-vnc-server}
   sipb-xen-www:
     {punt: 1360, merge: invirt-web}
     {punt: 1387, merge: invirt-vnc-server}
   sipb-xen-www:
     {punt: 1360, merge: invirt-web}

+  xvm-authz-locker: {}

   xvm-console-devconfig:
     {punt: 700}
   xvm-db-backup: {}
   xvm-console-devconfig:
     {punt: 700}
   xvm-db-backup: {}

@@ -142,3 +144,6 @@ quashes:
 - {rev: 2033, path: /trunk/scripts/}
 - {rev: 2035, path: /trunk/scripts/}
 - {rev: 2309, path: /third_tags/openssh/debathena1/}
 - {rev: 2033, path: /trunk/scripts/}
 - {rev: 2035, path: /trunk/scripts/}
 - {rev: 2309, path: /third_tags/openssh/debathena1/}

+- {rev: 2614, path: /package_branches/invirt-base/}
+- {rev: 2615, path: /package_branches/invirt-base/}
+- {rev: 2616, path: /package_branches/invirt-base/}