Fill out the full list of merges (unsorted).

svn path=/trunk/scripts/git-migration/; revision=1886

diff --git a/merges b/merges
index cf445b8..adcbe7f 100644 (file)
--- a/merges
+++ b/merges
@@ -8,3 +8,24 @@
 # (n is translated into a revision using git rev-list --reverse
 # --skip=<n> | head -n 1)
 invirt-console-host    invirt-console  2
 # (n is translated into a revision using git rev-list --reverse
 # --skip=<n> | head -n 1)
 invirt-console-host    invirt-console  2

+invirt-console-server  invirt-console  0
+invirt-remote-host     invirt-remote   0
+invirt-remote-server   invirt-remote   0
+sipb-xen-autoinstaller invirt-autoinstaller    0
+sipb-xen-base  invirt-base     0
+sipb-xen-console-server        invirt-console-host     0
+sipb-xen-console       invirt-console-server   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