D212: tests: demonstrate crash when trying to rebase merge without its parents
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Aug 3 10:38:28 EDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG855a1856466d: tests: demonstrate crash when trying to rebase merge without its parents (authored by martinvonz).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D212?vs=495&id=524#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D212?vs=495&id=524
REVISION DETAIL
https://phab.mercurial-scm.org/D212
AFFECTED FILES
tests/test-rebase-obsolete.t
CHANGE DETAILS
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -473,6 +473,27 @@
$ cd ..
+Detach both parents
+
+ $ hg init double-detach
+ $ cd double-detach
+
+ $ hg debugdrawdag <<EOF
+ > F
+ > /|
+ > C E
+ > | |
+ > B D G
+ > \|/
+ > A
+ > EOF
+
+BROKEN: This raises an exception
+ $ hg rebase -d G -r 'B + D + F' 2>&1 | grep '^AssertionError'
+ AssertionError: no base found to rebase on (defineparents called wrong)
+
+ $ cd ..
+
test on rebase dropping a merge
(setup)
To: martinvonz, #hg-reviewers, quark
Cc: quark, mercurial-devel
More information about the Mercurial-devel
mailing list