D7177: rebase: introduce optional parent mapping
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Fri Sep 17 14:02:58 UTC 2021
marmoute added a comment.
In D7177#175507 <https://phab.mercurial-scm.org/D7177#175507>, @joerg.sonnenberger wrote:
> From the VC call today: The use case can be addressed by marking parents as to-be-preserved, so that for merge commits rebase can decide on the parent link is should operate on. It covers a general DAG and is somewhat easier to use in terms of UX than the parentmap, but can provide the same functionality with a multi-step rebase.
Yeah, something like `--preserve-parent XXX` where XXX is a set a revs to "preserve". When rebasing a revision, if it has parents in XXX we keep them (and rebase the other). if no parent are in XXX, we don't care.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7177/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7177
To: joerg.sonnenberger, martinvonz, #hg-reviewers, baymax
Cc: mercurial-patches, marmoute, mercurial-devel
More information about the Mercurial-devel
mailing list