Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 40802:e204d9a27528 stable
tests: show that in-mem rebase does not find path dir/file conflicts
Differential Revision: https://phab.mercurial-scm.org/D5359
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 03 Dec 2018 11:11:34 -0800 |
| parents | 6f679f25fd4d |
| children | 44c2e80db985 |
comparison
equal
deleted
inserted
replaced
| 40801:97190b0bb81a | 40802:e204d9a27528 |
|---|---|
| 237 | | | 237 | | |
| 238 o | 1: fc055c3b4d33 'b' | 238 o | 1: fc055c3b4d33 'b' |
| 239 |/ | 239 |/ |
| 240 o 0: b173517d0057 'a' | 240 o 0: b173517d0057 'a' |
| 241 | 241 |
| 242 $ mkdir c | |
| 243 $ echo c > c/c | |
| 244 $ hg add c/c | |
| 245 $ hg ci -m 'c/c' | |
| 246 BROKEN: This should be a conflict, should not crash | |
| 247 $ hg rebase -r . -d 3 -n 2>&1 | grep KeyError | |
| 248 KeyError: 'c' | |
| 249 BROKEN: This should be a conflict, should not crash | |
| 250 $ hg rebase -r 3 -d . -n 2>&1 | grep KeyError | |
| 251 KeyError: 'c/c' | |
| 242 | 252 |
| 243 $ cd .. | 253 $ cd .. |
| 244 | 254 |
| 245 Test dry-run rebasing | 255 Test dry-run rebasing |
| 246 | 256 |