Mercurial > hg
comparison tests/test-merge-subrepos.t @ 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 | 6981d120c9d7 |
comparison
equal
deleted
inserted
replaced
33365:6d88468d435b | 33366:062c1bde1781 |
---|---|
105 $ hg up -r '.^' --check | 105 $ hg up -r '.^' --check |
106 abort: uncommitted changes in subrepository "subrepo" | 106 abort: uncommitted changes in subrepository "subrepo" |
107 [255] | 107 [255] |
108 | 108 |
109 $ hg up -r '.^' --config ui.interactive=True << EOF | 109 $ hg up -r '.^' --config ui.interactive=True << EOF |
110 > c | 110 > d |
111 > EOF | 111 > EOF |
112 other [destination] changed b which local [working copy] deleted | 112 other [destination] changed b which local [working copy] deleted |
113 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c | 113 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d |
114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
115 | 115 |
116 XXX: There's a difference between wdir() and '.', so there should be a status. | |
117 `hg files -S` from the top is also missing 'subrepo/b'. | |
118 | |
116 $ hg st -S | 119 $ hg st -S |
120 $ hg st -R subrepo | |
121 $ hg files -R subrepo | |
122 [1] | |
123 $ hg files -R subrepo -r '.' | |
124 subrepo/b (glob) | |
117 | 125 |
118 $ hg bookmark -r tip @other | 126 $ hg bookmark -r tip @other |
119 $ echo xyz > subrepo/c | 127 $ echo xyz > subrepo/c |
120 $ hg ci -SAm 'add c' | 128 $ hg ci -SAm 'add c' |
121 adding subrepo/c | 129 adding subrepo/c |