Page MenuHomePhabricator

rebase: introduce optional parent mapping
Needs ReviewPublic

Authored by joerg.sonnenberger on Oct 28 2019, 12:17 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Summary

Consider the following DAG:

C   C'
|\ /|
A B D

with the goal of rebasing C to C' while switching the A parent to D.
Out of the box, rebase will fail here as it doesn't know which parent of
C to rewrite. With the new --parentmap option, this can be specified
explicitly. Use cases for this functionality are dealing with manual
rebases without obsolescence markers, e.g. git-style forced commits.

Diff Detail

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

Event Timeline

joerg.sonnenberger retitled this revision from [PoC] allow providing explicit mapping for parents of merge commits to rebase: introduce optional parent mapping.Oct 28 2019, 4:02 PM
joerg.sonnenberger edited the summary of this revision. (Show Details)
joerg.sonnenberger updated this revision to Diff 17411.
martinvonz edited the summary of this revision. (Show Details)Oct 30 2019, 1:37 AM

I changed the commit message to indent the graph by two spaces. That way it renders better here in Phabricator.