D4407: tests: add test showing that rebase of extinct commit with successor fails

[martinvonz (Martin von Zweigbergk)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa3af500a1362: tests: add test showing that rebase of extinct commit with successor fails (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4407?vs=10614&id=10641

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

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
@@ -1511,6 +1511,28 @@
   
   $ cd ..
 
+Rebase merge where extinct node has successor that is not an ancestor of
+destination
+
+  $ hg init extinct-with-succ-not-in-dest
+  $ cd extinct-with-succ-not-in-dest
+
+  $ hg debugdrawdag <<EOF
+  > E C # replace: C -> E
+  > | |
+  > D B
+  > |/
+  > A
+  > EOF
+
+TODO: There doesn't seem to be much reason to fail this rebase. Make it pass?
+  $ hg rebase -d D -s B
+  abort: this rebase will cause divergences from: 26805aba1e60
+  (to force the rebase please set experimental.evolution.allowdivergence=True)
+  [255]
+
+  $ cd ..
+
   $ hg init p2-succ-in-dest-c
   $ cd p2-succ-in-dest-c
 



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