X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/ffcef9bdd3a5ebba7e16447d3025662656e70f05..33427e2048fd1425c5085482da197c9d85f9e58b:/merges

diff --git a/merges b/merges
index cf445b8..f593991 100644
--- a/merges
+++ b/merges
@@ -7,4 +7,26 @@
 #
 # (n is translated into a revision using git rev-list --reverse
 # --skip=<n> | head -n 1)
+
+sipb-xen-base	invirt-base	0
+sipb-xen-console	invirt-console-server	0
+sipb-xen-console-server	invirt-console-host	0
+sipb-xen-database	invirt-database	0
+sipb-xen-dev	invirt-dev	0
+sipb-xen-dhcp	invirt-dhcp	0
+sipb-xen-dns	invirt-dns	0
+sipb-xen-dom0	invirt-xen-config	0
+sipb-xen-guest-installer	sipb-xen-autoinstaller	0
+sipb-xen-host-master	invirt-host-master	0
+sipb-xen-iptables	invirt-web-iptables	0
+sipb-xen-python-pydhcplib	python-pydhcplib	0
+sipb-xen-remctl-auto	invirt-remote-host	0
+sipb-xen-remote-server	invirt-remote-server	0
+sipb-xen-vnc-client	invirt-vnc-client	0
+sipb-xen-vnc-server	invirt-vnc-server	0
+sipb-xen-www	invirt-web	0
+invirt-console-server	invirt-console	0
 invirt-console-host	invirt-console	2
+sipb-xen-autoinstaller	invirt-autoinstaller	0
+invirt-remote-host	invirt-remote	0
+invirt-remote-server	invirt-remote	0