X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/7ee61b3ca53e31cfd15f533b94f19de94f096cee..fc13f26a890f926dbb66499fb19bb56ca174e2d7:/svn.yml

diff --git a/svn.yml b/svn.yml
index 8c1def7..3496bd4 100644
--- a/svn.yml
+++ b/svn.yml
@@ -82,14 +82,27 @@ 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
 - invirt.mit.edu
 - 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/}