From ee6ac38848277d80c62fa5c2734ada1b5edc8680 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Nov 2017 13:48:02 +0100 Subject: fetchGit/fetchMercurial: Filter out directories with untracked files --- tests/fetchMercurial.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/fetchMercurial.sh') diff --git a/tests/fetchMercurial.sh b/tests/fetchMercurial.sh index 9c897ada96ac..0c9f4bdbbc87 100644 --- a/tests/fetchMercurial.sh +++ b/tests/fetchMercurial.sh @@ -58,15 +58,18 @@ path2=$(nix eval --raw "(builtins.fetchMercurial $repo).outPath") [[ $path = $path2 ]] # Using an unclean tree should yield the tracked but uncommitted changes. -echo foo > $repo/foo +mkdir $repo/dir1 $repo/dir2 +echo foo > $repo/dir1/foo echo bar > $repo/bar -hg add --cwd $repo foo +echo bar > $repo/dir2/bar +hg add --cwd $repo dir1/foo hg rm --cwd $repo hello path2=$(nix eval --raw "(builtins.fetchMercurial $repo).outPath") [ ! -e $path2/hello ] [ ! -e $path2/bar ] -[[ $(cat $path2/foo) = foo ]] +[ ! -e $path2/dir2/bar ] +[[ $(cat $path2/dir1/foo) = foo ]] [[ $(nix eval --raw "(builtins.fetchMercurial $repo).rev") = 0000000000000000000000000000000000000000 ]] -- cgit 1.4.1