Mercurial > hg
diff tests/test-copytrace-heuristics.t @ 44724:5c2a4f37eace
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 | dc5e5577af39 |
line wrap: on
line diff
--- a/tests/test-copytrace-heuristics.t Fri Apr 10 19:53:36 2020 +0200 +++ b/tests/test-copytrace-heuristics.t Fri Apr 10 19:58:34 2020 +0200 @@ -292,7 +292,8 @@ rebasing 1:472e38d57782 "mv a b" saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062 - $ ls + $ ls -A + .hg b $ cd .. $ rm -rf repo @@ -433,7 +434,8 @@ rebasing 3:ef716627c70b "mod a" (tip) merging b and a to b saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg - $ ls + $ ls -A + .hg b c $ cat b @@ -470,7 +472,8 @@ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -m merge - $ ls + $ ls -A + .hg b $ cd .. $ rm -rf repo @@ -505,7 +508,8 @@ merging b and a to b merging c and a to c saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg - $ ls + $ ls -A + .hg b c $ cat b @@ -558,7 +562,8 @@ |/ desc: mod a o rev: 0, phase: draft desc: initial - $ ls + $ ls -A + .hg c $ cd .. $ rm -rf repo @@ -588,7 +593,8 @@ unshelving change 'default' rebasing shelved changes merging b and a to b - $ ls + $ ls -A + .hg b $ cat b b