Patchwork D10136: tests: clarify some missing output in test-merge-subrepos

login
register
mail settings
Submitter phabricator
Date March 9, 2021, 9:42 a.m.
Message ID <differential-rev-PHID-DREV-px6ytgsmgvah2mqszozh-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48450/
State Superseded
Headers show

Comments

phabricator - March 9, 2021, 9:42 a.m.
SimonSapin created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This makes the test behavior clearer, especially, why the output are
  inconsistent.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10136

AFFECTED FILES
  tests/test-merge-subrepos.t

CHANGE DETAILS




To: SimonSapin, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-merge-subrepos.t b/tests/test-merge-subrepos.t
--- a/tests/test-merge-subrepos.t
+++ b/tests/test-merge-subrepos.t
@@ -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 '.'