Skip to content
Snippets Groups Projects
Commit bd5467169d3c authored by durin42's avatar durin42
Browse files

test-subrepos: cope with unsorted output in .hgsub

parent 6da65b534370
No related branches found
No related tags found
No related merge requests found
......@@ -38,5 +38,6 @@
$ 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
......@@ -42,5 +43,4 @@
xyz/subrepo2 = [git]../gitsubrepo
subrepo1 = [git]../gitsubrepo
.hgsubstate shall list two idenitcal revisions
$ cat .hgsubstate
56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1
......@@ -108,5 +108,5 @@
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
......@@ -112,2 +112,3 @@
hgsub = $TESTTMP/hgsub
subrepo1 = [git]../gitsubrepo
xyz/subrepo2 = [git]../gitsubrepo
......@@ -113,5 +114,4 @@
xyz/subrepo2 = [git]../gitsubrepo
subrepo1 = [git]../gitsubrepo
.hgsubstate shall list revision of the subrepo added through git repo
$ cat hgrepo/.hgsubstate
481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment