Skip to content
Snippets Groups Projects
Commit 644dddcc authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

tests: demonstrate broken rebase of merge with p1's successor in dest

The fix in 8ede973597fd (rebase: handle successor targets (issue5198),
2016-04-11) only fixed the case where p2's successor was in the
destination, and only when the successor was exactly the destination
(i.e. not when the successor was an ancestor of it). This patch adds a
test case for when p1's successor is in the destination. It adds
another one for when the successor is an ancestor of the
destination. To do that simply, it also rewrites the test case using
drawdag.

Differential Revision: https://phab.mercurial-scm.org/D211
parent 9f862fe7
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment