Changeset 1887 for trunk/scripts

Timestamp:

Dec 24, 2008, 11:33:24 PM (16 years ago)

Author:

broder

Message:

Topologically sort the merges file.

File:

• trunk/scripts/git-migration/merges (modified) (2 diffs)

trunk/scripts/git-migration/merges

@@ -8 +8 @@
 # (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        invirt-console-server   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
@@ -30 +26 @@
 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