Mercurial > public > mercurial-scm > hg

diff tests/test-sparse-merges.t @ 44724:5c2a4f37eace

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems BSD-derived systems will use "ls -A" when running as root. Adjust the test cases to always use the flag and include .hg and related output as appropiately. Differential Revision: https://phab.mercurial-scm.org/D8397
author Joerg Sonnenberger <joerg@bec.de>
date Fri, 10 Apr 2020 19:58:34 +0200
parents 4764e8436b2a
children 76b4b36cd5d0
line wrap: on
line diff
--- a/tests/test-sparse-merges.t	Fri Apr 10 19:53:36 2020 +0200
+++ b/tests/test-sparse-merges.t	Fri Apr 10 19:58:34 2020 +0200
@@ -28,7 +28,8 @@
 
 Verify bar was merged temporarily
 
-  $ ls
+  $ ls -A
+  .hg
   bar
   foo
   $ hg status
@@ -39,7 +40,8 @@
   $ hg commit -m "merged"
   cleaned up 1 temporarily added file(s) from the sparse checkout
   $ hg status
-  $ ls
+  $ ls -A
+  .hg
   foo
 
   $ hg cat -r . bar
@@ -108,7 +110,9 @@
   o  0:53f3774ed939 added .hgignore
   
   $ hg debugsparse --exclude "d"
-  $ ls
+  $ ls -A
+  .hg
+  .hgignore
   a
 
   $ hg merge
@@ -168,7 +172,9 @@
   o  0:53f3774ed939 added .hgignore
   
   $ hg debugsparse --exclude "a"
-  $ ls
+  $ ls -A
+  .hg
+  .hgignore
   d
 
   $ hg merge