From f7297e3a4943de0023608cb9c7eb6c066db93009 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Wed, 24 Dec 2008 23:33:24 -0500 Subject: [PATCH] Topologically sort the merges file. svn path=/trunk/scripts/git-migration/; revision=1887 --- merges | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/merges b/merges index adcbe7f..f593991 100644 --- a/merges +++ b/merges @@ -7,14 +7,10 @@ # # (n is translated into a revision using git rev-list --reverse # --skip= | 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-console-server invirt-console-host 0 sipb-xen-database invirt-database 0 sipb-xen-dev invirt-dev 0 sipb-xen-dhcp invirt-dhcp 0 @@ -29,3 +25,8 @@ 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 -- 1.7.9.5