Mercurial > hg > hg-git

changeset 606:bd5467169d3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-subrepos: cope with unsorted output in .hgsub
author Augie Fackler <raf@durin42.com>
date Wed, 28 Aug 2013 13:52:38 -0400
parents 6da65b534370
children 980c37f6a8f9
files tests/test-subrepos.t
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-subrepos.t
+++ b/tests/test-subrepos.t
@@ -38,9 +38,9 @@
   $ hg bookmarks -f -r default master
 1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull
 .hgsub shall list two [git] subrepos
-  $ cat .hgsub
+  $ cat .hgsub | sort
+  subrepo1 = [git]../gitsubrepo
   xyz/subrepo2 = [git]../gitsubrepo
-  subrepo1 = [git]../gitsubrepo
 .hgsubstate shall list two idenitcal revisions
   $ cat .hgsubstate
   56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1
@@ -108,10 +108,10 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
 pull shall bring .hgsub entry which was added to the git repo
-  $ cat hgrepo/.hgsub
+  $ cat hgrepo/.hgsub | sort
   hgsub = $TESTTMP/hgsub
+  subrepo1 = [git]../gitsubrepo
   xyz/subrepo2 = [git]../gitsubrepo
-  subrepo1 = [git]../gitsubrepo
 .hgsubstate shall list revision of the subrepo added through git repo
   $ cat hgrepo/.hgsubstate
   481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub