Mercurial > hg
diff tests/test-rebase-obsolete.t @ 39328:94a4980695f8
rebase: skip extinct revisions even if it has no successor in rebase set
Differential Revision: https://phab.mercurial-scm.org/D4408
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 12 Jul 2018 12:11:20 -0700 |
parents | a3af500a1362 |
children | 89630d0b3e23 |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Wed Jul 11 12:26:44 2018 -0700 +++ b/tests/test-rebase-obsolete.t Thu Jul 12 12:11:20 2018 -0700 @@ -1525,11 +1525,9 @@ > 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] + rebasing 1:112478962961 "B" (B) + note: not rebasing 3:26805aba1e60 "C" (C) and its descendants as this would cause divergence $ cd ..