Page MenuHomePhabricator

rebase: make sure pruning does not confuse rebase (issue6180)
AbandonedPublic

Authored by khanchi97 on Dec 27 2019, 11:56 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Summary

Before this patch, if a user is rebasing a stack of commits and
hit a conflict in between and decided to drop that commit (the commit
which is being rebased but hit conflict) and pruned it, now what
hg rebase --continue does is: skip that dropped commit and move
on to rebase the next commit and gets confused here because wdir
has two parents which is because while we skipped that dropped
commit wdir had two parents and we didn't update that to one parent.

Changes in test file demonstrate the fixed behavior.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

khanchi97 created this revision.Dec 27 2019, 11:56 AM
khanchi97 abandoned this revision.Dec 27 2019, 12:04 PM

abandoing because I phabsent them in reverse order and it got messed up saying 'Graph cycle detected'