D6379: tests: demonstrate crash when rebasing across copy with --collapse
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu May 16 07:58:50 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG89b5fb616c8a: tests: demonstrate crash when rebasing across copy with --collapse (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6379?vs=15123&id=15139
REVISION DETAIL
https://phab.mercurial-scm.org/D6379
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
@@ -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 at b977edf6f839: not found in manifest!
+ [255]
+ $ cd ..
+
Test rebasing when the file we are merging in destination is empty
$ hg init test
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list