Show More
@@ -2584,7 +2584,7 b' def cat(ui, repo, ctx, matcher, prefix, ' | |||||
2584 | # Don't warn about "missing" files that are really in subrepos |
|
2584 | # Don't warn about "missing" files that are really in subrepos | |
2585 | def badfn(path, msg): |
|
2585 | def badfn(path, msg): | |
2586 | for subpath in ctx.substate: |
|
2586 | for subpath in ctx.substate: | |
2587 | if path.startswith(subpath): |
|
2587 | if path.startswith(subpath + '/'): | |
2588 | return |
|
2588 | return | |
2589 | matcher.bad(path, msg) |
|
2589 | matcher.bad(path, msg) | |
2590 |
|
2590 |
@@ -60,6 +60,9 b' Subrepopath which overlaps with filepath' | |||||
60 | $ hg remove -S snot/file |
|
60 | $ hg remove -S snot/file | |
61 | not removing snot/file: file is untracked |
|
61 | not removing snot/file: file is untracked | |
62 | [1] |
|
62 | [1] | |
|
63 | $ hg cat snot/filenot | |||
|
64 | snot/filenot: no such file in rev 7cf8cfea66e4 | |||
|
65 | [1] | |||
63 | $ rm -r snot |
|
66 | $ rm -r snot | |
64 |
|
67 | |||
65 | Revert subrepo and test subrepo fileset keyword: |
|
68 | Revert subrepo and test subrepo fileset keyword: |
General Comments 0
You need to be logged in to leave comments.
Login now