# HG changeset patch # User Pierre-Yves David # Date 1615221142 -3600 # Node ID b4ad45f2f648d0e85b6b59987d5972d233b79eb4 # Parent e96a0a53de20700beacccb656617bceab78f639e tests: clarify some missing output in test-merge-subrepos This makes the test behavior clearer, especially, why the output are inconsistent. Differential Revision: https://phab.mercurial-scm.org/D10136 diff -r e96a0a53de20 -r b4ad45f2f648 tests/test-merge-subrepos.t --- a/tests/test-merge-subrepos.t Fri Mar 05 11:39:21 2021 +0100 +++ b/tests/test-merge-subrepos.t Mon Mar 08 17:32:22 2021 +0100 @@ -117,10 +117,17 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved XXX: There's a difference between wdir() and '.', so there should be a status. -`hg files -S` from the top is also missing 'subrepo/b'. +`hg files -S` from the top is also missing 'subrepo/b'. The files should be +seen as deleted (and, maybe even missing? in which case `hg files` should list +it) $ hg st -S + R subrepo/b (missing-correct-output !) $ hg st -R subrepo + R subrepo/b (missing-correct-output !) + +(note: return [1] because no files "match" since the list is empty) + $ hg files -R subrepo [1] $ hg files -R subrepo -r '.'