Skip to content
Snippets Groups Projects
Commit e204d9a2 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

tests: show that in-mem rebase does not find path dir/file conflicts

Differential Revision: https://phab.mercurial-scm.org/D5359
parent 97190b0b
No related branches found
No related tags found
No related merge requests found
......@@ -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 ..
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment