Mercurial > public > mercurial-scm > hg
diff tests/test-subrepo-deep-nested-change.t @ 28387:97175d9bf7cf stable
files: don't recurse into subrepos without a path or -S (issue5127)
The 'm.always()' check was needed for when a path to 'sub1' is given, and 'sub1'
contains a subrepo itself. But that also caused the automatic recursion when no
path was given. Instead, force -S when printing a subrepo if the subpath is an
exact match (which will unconditionally recurse once in the nested subrepo).
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 06 Mar 2016 14:30:34 -0500 |
parents | 4b0fc75f9403 |
children | 3072ce740945 |
line wrap: on
line diff
--- a/tests/test-subrepo-deep-nested-change.t Tue Jan 26 22:44:29 2016 +0900 +++ b/tests/test-subrepo-deep-nested-change.t Sun Mar 06 14:30:34 2016 -0500 @@ -297,6 +297,12 @@ sub1/sub2/folder/bar (glob) sub1/sub2/x.txt (glob) + $ hg files + .hgsub + .hgsubstate + foo/bar/abc (glob) + main + $ hg files -S -r '.^' sub1/sub2/folder sub1/sub2/folder/test.txt (glob)