Mercurial > hg-stable
changeset 33366:062c1bde1781
test-subrepo: demonstrate a status problem when merge deletes a file
At the interactive update prompt, if (c) is chosen and then followed by `hg rm`,
both `status -R` and `status -S` show the file as 'R', and `files -R` shows no
files (OK, because explicitly removed files aren't supposed to be listed). If
`rm` follows selecting (c), then both flavors of `status` list the file as '!',
and `files -R` lists the missing file. So somehow, the (d) option has followed
a third path.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 09 Jul 2017 16:38:04 -0400 |
| parents | 6d88468d435b |
| children | 6029939f7e98 |
| files | tests/test-merge-subrepos.t |
| diffstat | 1 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-subrepos.t Sun Jul 09 16:13:30 2017 -0400 +++ b/tests/test-merge-subrepos.t Sun Jul 09 16:38:04 2017 -0400 @@ -107,13 +107,21 @@ [255] $ hg up -r '.^' --config ui.interactive=True << EOF - > c + > d > EOF other [destination] changed b which local [working copy] deleted - use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c + use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d 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 st -S + $ hg st -R subrepo + $ hg files -R subrepo + [1] + $ hg files -R subrepo -r '.' + subrepo/b (glob) $ hg bookmark -r tip @other $ echo xyz > subrepo/c