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

diff --git a/svn.yml b/svn.yml
index 492baad..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/}
@@ -125,3 +138,6 @@ quashes:
 - {rev: 1904, path: /trunk/packages/invirt-dhcp/}
 - {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/}