X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/b9ecb45386a2f9ab56c069ccffbc27e4d70b0c4d..1da281310f8335a120e21e4c36b8b186eb2fd298:/svn.yml

diff --git a/svn.yml b/svn.yml
index 1f7b3de..f15e84f 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: {}
@@ -95,9 +96,12 @@ scripts:
 - git-migration
 - install-invirt
 - invirt.mit.edu
+- osx-update
 - munin
 - prod-migration
 - vnc-client
+- invirt-admin
+- invirt-test-build
 quashes:
 - {rev: 11, path: /package_tags/sipb-xen-dev/sipb-xen-dev/}
 - {rev: 316, path: /package_tags/sipb-xen-dev/13/}
@@ -126,3 +130,5 @@ 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/}