# HG changeset patch # User Martin von Zweigbergk # Date 1543864294 28800 # Node ID e204d9a2752876b313c66ef1c3387050c70cdc97 # Parent 97190b0bb81a80fa3ca3aac641940fc1e4f14aab tests: show that in-mem rebase does not find path dir/file conflicts Differential Revision: https://phab.mercurial-scm.org/D5359 diff -r 97190b0bb81a -r e204d9a27528 tests/test-rebase-inmemory.t --- 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 ..