Mercurial > hg-stable
changeset 40455: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 | 97190b0bb81a |
| children | 44c2e80db985 |
| files | tests/test-rebase-inmemory.t |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t Mon Dec 03 20:59:48 2018 -0500 +++ b/tests/test-rebase-inmemory.t Mon Dec 03 11:11:34 2018 -0800 @@ -239,6 +239,16 @@ |/ o 0: b173517d0057 'a' + $ mkdir c + $ echo c > c/c + $ hg add c/c + $ hg ci -m 'c/c' +BROKEN: This should be a conflict, should not crash + $ hg rebase -r . -d 3 -n 2>&1 | grep KeyError + KeyError: 'c' +BROKEN: This should be a conflict, should not crash + $ hg rebase -r 3 -d . -n 2>&1 | grep KeyError + KeyError: 'c/c' $ cd ..