diff tests/test-convert-svn-move.t @ 18376:13d73bf6be29

convert: make toposort order stable when multiple orderings are possible The output of some tests are changed. Not necessarily to the better, just other valid permutations.
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 13 Dec 2012 23:15:51 +0100
parents 6047947afb6b
children aa9385f983fa
line wrap: on
line diff
--- a/tests/test-convert-svn-move.t	Tue Jan 15 02:59:14 2013 +0100
+++ b/tests/test-convert-svn-move.t	Thu Dec 13 23:15:51 2012 +0100
@@ -100,8 +100,8 @@
   4 clobber1
   3 clobber2
   2 adddb
-  1 branch
-  0 clobberdir
+  1 clobberdir
+  0 branch
 
   $ cd hg-repo
 
@@ -210,9 +210,7 @@
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [=============================>            ] 5/7\r (no-eol) (esc)
-  scanning paths [                                      ] 0/3\r (no-eol) (esc)
-  scanning paths [===========>                          ] 1/3\r (no-eol) (esc)
-  scanning paths [========================>             ] 2/3\r (no-eol) (esc)
+  scanning paths [                                      ] 0/1\r (no-eol) (esc)
   getting files [===>                                   ] 1/8\r (no-eol) (esc)
   getting files [========>                              ] 2/8\r (no-eol) (esc)
   getting files [=============>                         ] 3/8\r (no-eol) (esc)
@@ -224,7 +222,9 @@
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [===================================>      ] 6/7\r (no-eol) (esc)
-  scanning paths [                                      ] 0/1\r (no-eol) (esc)
+  scanning paths [                                      ] 0/3\r (no-eol) (esc)
+  scanning paths [===========>                          ] 1/3\r (no-eol) (esc)
+  scanning paths [========================>             ] 2/3\r (no-eol) (esc)
   getting files [===>                                   ] 1/8\r (no-eol) (esc)
   getting files [========>                              ] 2/8\r (no-eol) (esc)
   getting files [=============>                         ] 3/8\r (no-eol) (esc)
@@ -243,7 +243,7 @@
   4 clobber1
   3 clobber2
   2 adddb
-  1 branch
-  0 clobberdir
+  1 clobberdir
+  0 branch
 
   $ cd ..