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

login
register
mail settings
Submitter phabricator
Date Dec. 4, 2018, 12:15 p.m.
Message ID <a6b02b733555628827609acd3d9a93c4@localhost.localdomain>
Download mbox | patch
Permalink /patch/36943/
State Not Applicable
Headers show

Comments

phabricator - Dec. 4, 2018, 12:15 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe204d9a27528: tests: show that in-mem rebase does not find path dir/file conflicts (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5359?vs=12684&id=12690

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

AFFECTED FILES
  tests/test-rebase-inmemory.t

CHANGE DETAILS




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

Patch

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 ..