# HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 2018-01-18 03:12:10 # Node ID 1880a0bdfc5e48bd3cb461a9e19091eac57f5cb0 # Parent a62b08f6626bd0f838b2c77a2f1a48068852be1f test-convert-svn-move: sort svn checkout output It turns out that there's no guarantee in which order svn will traverse a directory while performing a checkout. Sorting the output will make these tests stable. diff --git a/tests/test-convert-svn-source.t b/tests/test-convert-svn-source.t --- a/tests/test-convert-svn-source.t +++ b/tests/test-convert-svn-source.t @@ -268,7 +268,7 @@ try converting when we have an svn subre $ cd withmerge $ echo "subrepo = [svn]$SVNREPOURL" >.hgsub $ hg add .hgsub - $ svn checkout "$SVNREPOURL" subrepo + $ svn checkout "$SVNREPOURL" subrepo | sort A subrepo/proj B A subrepo/proj B/mytrunk A subrepo/proj B/mytrunk/letter .txt @@ -305,7 +305,8 @@ try converting when we have an svn subre 1 Adding file2 0 merged $ cd withmerge-converted - $ hg up + $ hg up | sort + 4 files updated, 0 files merged, 0 files removed, 0 files unresolved A subrepo/proj B A subrepo/proj B/mytrunk A subrepo/proj B/mytrunk/letter .txt @@ -317,7 +318,6 @@ try converting when we have an svn subre A subrepo/proj B/tags/v0.2/letter .txt A subrepo/proj B/tags/v0.2/letter2.txt Checked out revision 9. - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved $ ls file1.txt file2.txt