tests: demonstrate crash when rebasing across copy with --collapse
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 15 May 2019 16:10:52 -0700
changeset 42317 70845eb656a9
parent 42316 c07dcf7a0247
child 42318 313812cbf4ca
tests: demonstrate crash when rebasing across copy with --collapse As reported by timeless. Differential Revision: https://phab.mercurial-scm.org/D6379
tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t	Wed May 15 17:18:57 2019 -0400
+++ b/tests/test-rebase-inmemory.t	Wed May 15 16:10:52 2019 -0700
@@ -784,6 +784,25 @@
   R a
   $ cd ..
 
+Rebase across a copy with --collapse
+
+  $ hg init rebase-rename-collapse
+  $ cd rebase-rename-collapse
+  $ echo a > a
+  $ hg ci -Aqm 'add a'
+  $ hg mv a b
+  $ hg ci -m 'rename a to b'
+  $ hg co -q 0
+  $ echo a2 > a
+  $ hg ci -qm 'modify a'
+BROKEN: obviously...
+  $ hg rebase -r . -d 1 --collapse
+  rebasing 2:41c4ea50d4cf "modify a" (tip)
+  merging b and a to b
+  abort: a@b977edf6f839: not found in manifest!
+  [255]
+  $ cd ..
+
 Test rebasing when the file we are merging in destination is empty
 
   $ hg init test