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

[martinvonz (Martin von Zweigbergk)]

martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5359

AFFECTED FILES
  tests/test-rebase-inmemory.t

CHANGE DETAILS

diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -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 ..
 



To: martinvonz, #hg-reviewers
Cc: mercurial-devel