D7177: rebase: introduce optional parent mapping

marmoute added a comment. In 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

D7177: rebase: introduce optional parent mapping

joerg.sonnenberger added a comment. 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

D7177: rebase: introduce optional parent mapping

marmoute added a comment. In D7177#128760 , @martinvonz wrote: > In D7177#128757 , @marmoute wrote: > >> In D7177#128756 , @martinvonz wrote: >>

D7177: rebase: introduce optional parent mapping

martinvonz added a comment. In D7177#128757 , @marmoute wrote: > In D7177#128756 , @martinvonz wrote: > >> In D7177#128740 , @marmoute wrote: >>

D7177: rebase: introduce optional parent mapping

marmoute added a comment. In D7177#128756 , @martinvonz wrote: > In D7177#128740 , @marmoute wrote: > >> In D7177#128389 , @martinvonz wrote: >>

D7177: rebase: introduce optional parent mapping

martinvonz added a comment. In D7177#128740 , @marmoute wrote: > In D7177#128389 , @martinvonz wrote: > >> Maybe another option is to allow multiple `-d` arguments for this case? Something

D7177: rebase: introduce optional parent mapping

marmoute added a comment. In D7177#128389 , @martinvonz wrote: > Maybe another option is to allow multiple `-d` arguments for this case? Something like `hg rebase -r C -d B -d D`. I haven't thought through BC, but I think that's what I'd

D7177: rebase: introduce optional parent mapping

martinvonz added a comment. Maybe another option is to allow multiple `-d` arguments for this case? Something like `hg rebase -r C -d B -d D`. I haven't thought through BC, but I think that's what I'd prefer if we were writing rebase from scratch. I know we can't support `hg rebase -r C -d

D7177: rebase: introduce optional parent mapping

Herald added a subscriber: mercurial-patches. This revision now requires changes to proceed. baymax added a comment. baymax requested changes to this revision. There seems to have been no activities on this Diff for the past 3 Months. By policy, we are automatically moving it out of the

D7177: rebase: introduce optional parent mapping

marmoute added a comment. I like the idea of using adding this to graft. 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 Cc: marmoute,

D7177: rebase: introduce optional parent mapping

martinvonz added a comment. I personally haven't queued this yet because I don't really like the UI. Some things I recently worked on made me realize that `hg graft` doesn't currently preserve merges, but we could probably easily add a `--preserve-merges` option to it, so `hg co D; hg graft

D7177: rebase: introduce optional parent mapping

martinvonz added a comment. I changed the commit message to indent the graph by two spaces. That way it renders better here in Phabricator. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7177/new/ REVISION DETAIL

D7177: rebase: introduce optional parent mapping

joerg.sonnenberger edited the summary of this revision. joerg.sonnenberger retitled this revision from "[PoC] allow providing explicit mapping for parents of merge commits" to "rebase: introduce optional parent mapping". joerg.sonnenberger updated this revision to Diff 17411. REPOSITORY rHG