branch | stable |
changeset 40802 | e204d9a27528 |
parent 40791 | 6f679f25fd4d |
child 40803 | 44c2e80db985 |
--- 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 ..