X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/7ee61b3ca53e31cfd15f533b94f19de94f096cee..58cc6ab01e03c699c86a999b8a50ef348e1a2af4:/svn.yml?ds=sidebyside

diff --git a/svn.yml b/svn.yml
index 8c1def7..343389c 100644
--- a/svn.yml
+++ b/svn.yml
@@ -29,10 +29,8 @@ packages:
   invirt-web-iptables: {}
   invirt-xen-config: {}
   libapache2-mod-auth-sslcert: {}
-  libyaml: {}
   python-pydhcplib: {}
   python-routefs: {}
-  pyyaml: {}
   sipb-xen-autoinstaller:
     {punt: 1569, merge: invirt-autoinstaller}
   sipb-xen-base:
@@ -82,14 +80,29 @@ packages:
   xvm-meta: {}
   xvm-munin-config: {}
   xvm-prodconfig: {}
+trunks:
+  dhcp:
+    {punt: 282, merge: sipb-xen-dhcp}
+  dns:
+    {punt: 269, merge: sipb-xen-dns, branch: dns}
+  vnc/vnc_javasrc:
+    {punt: 305, merge: sipb-xen-vnc-client}
+  vnc/vnc_server:
+    {punt: 286, inclusive: yes, merge: sipb-xen-vnc-server}
+  web:
+    {punt: 303, inclusive: yes, merge: sipb-xen-www}
 scripts:
 - git-migration
+- install-invirt
 - invirt.mit.edu
+- osx-update
 - munin
 - prod-migration
+- vnc-client
 quashes:
 - {rev: 11, path: /package_tags/sipb-xen-dev/sipb-xen-dev/}
 - {rev: 316, path: /package_tags/sipb-xen-dev/13/}
+- {rev: 318, path: /package_tags/sipb-xen-dev/13/sipb-xen-dev/}
 - {rev: 347, path: /package_tags/sipb-xen-console/2/}
 - {rev: 348, path: /package_tags/sipb-xen-console/2/sipb-xen-console/}
 - {rev: 349, path: /package_tags/sipb-xen-console/2/}
@@ -98,9 +111,21 @@ 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: 899, path: /package_tags/libyaml/}
+- {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: 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: 2033, path: /trunk/scripts/}
+- {rev: 2035, path: /trunk/scripts/}