Mercurial > public > mercurial-scm > hg

diff tests/test-convert-svn-source.t @ 35693:1880a0bdfc5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Jordi Guti?rrez Hermoso <jordigh@octave.org>
date Wed, 17 Jan 2018 22:12:10 -0500
parents 9c575c22dcf4
children 5abc47d4ca6b
line wrap: on
line diff
--- a/tests/test-convert-svn-source.t	Sat Jan 13 15:13:29 2018 +0900
+++ b/tests/test-convert-svn-source.t	Wed Jan 17 22:12:10 2018 -0500
@@ -268,7 +268,7 @@
   $ 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 @@
   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 @@
   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