X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/5d1bd1df3cf4dd69499c654032b323a86af7023e..573f4f05e544af781e596b827b22b4047e2cfe94:/svn.yml

diff --git a/svn.yml b/svn.yml
index 993d40c..5e2b0e4 100644
--- a/svn.yml
+++ b/svn.yml
@@ -10,7 +10,8 @@ packages:
   invirt-console-server:
     {punt: 1813, merge: invirt-console}
   invirt-database: {}
-  invirt-database-server: {}
+  invirt-database-server:
+    {punt: 2218, merge: invirt-database, branch: invirt-database-server}
   invirt-dev: {}
   invirt-dhcp: {}
   invirt-dns: {}
@@ -93,10 +94,22 @@ trunks:
     {punt: 303, inclusive: yes, merge: sipb-xen-www}
 scripts:
 - git-migration
+- git-hooks
+- install-invirt
 - invirt.mit.edu
+- osx-update
 - munin
 - prod-migration
 - vnc-client
+- invirt-admin
+- invirt-test-build
+- pv-fixup
+- outage
+- lvm-backup-reader
+third:
+- common
+- openssh
+- openafs
 quashes:
 - {rev: 11, path: /package_tags/sipb-xen-dev/sipb-xen-dev/}
 - {rev: 316, path: /package_tags/sipb-xen-dev/13/}
@@ -109,19 +122,22 @@ quashes:
 - {rev: 462, path: /package_tags/sipb-xen-dev/14/sipb-xen-dev/}
 - {rev: 463, path: /package_tags/sipb-xen-dev/14/}
 - {rev: 742, path: /trunk/packages/sipb-xen-autoinstaller/}
-- {rev: 898, path: /trunk/packages/libyaml}
-- {rev: 898, path: /trunk/packages/pyyaml}
+- {rev: 898, path: /trunk/packages/libyaml/}
+- {rev: 898, path: /trunk/packages/pyyaml/}
 - {rev: 899, path: /package_tags/libyaml/}
-- {rev: 900, path: /package_tags/libyaml/0.1.1-1~andersk1}
+- {rev: 900, path: /package_tags/libyaml/0.1.1-1~andersk1/}
 - {rev: 901, path: /package_tags/pyyaml/}
-- {rev: 902, path: /package_tags/pyyaml/3.05-2~andersk1}
-- {rev: 958, path: /trunk/packages/pyyaml}
-- {rev: 964, path: /package_tags/pyyaml/3.05-2~invirt1}
+- {rev: 902, path: /package_tags/pyyaml/3.05-2~andersk1/}
+- {rev: 958, path: /trunk/packages/pyyaml/}
+- {rev: 964, path: /package_tags/pyyaml/3.05-2~invirt1/}
 - {rev: 1201, path: /trunk/packages/invirt-console-server/}
 - {rev: 1455, path: /trunk/packages/xvm-prodconfig/}
 - {rev: 1757, path: /trunk/packages/invirt-xen-config/}
 - {rev: 1819, path: /trunk/packages/invirt-console/}
 - {rev: 1864, path: /trunk/scripts/prod-migration/}
 - {rev: 1904, path: /trunk/packages/invirt-dhcp/}
-- {rev: 1968, path: /trunk/packages/libyaml}
-- {rev: 1978, path: /trunk/packages/pyyaml}
+- {rev: 1968, path: /trunk/packages/libyaml/}
+- {rev: 1978, path: /trunk/packages/pyyaml/}
+- {rev: 2033, path: /trunk/scripts/}
+- {rev: 2035, path: /trunk/scripts/}
+- {rev: 2309, path: /third_tags/openssh/debathena1/}