D7630: absorb: make the absorbed changeset be automatically "evolved"
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Mon Jan 13 12:35:49 EST 2020
martinvonz added a comment.
In D7630#112603 <https://phab.mercurial-scm.org/D7630#112603>, @rdamazio wrote:
> Sorry for the upload mess (though it's arguably a `phabsend` bug :) ). Tried uploading the "right" way now.
I reported that as https://bz.mercurial-scm.org/show_bug.cgi?id=6241.
In D7630#115300 <https://phab.mercurial-scm.org/D7630#115300>, @pulkit wrote:
> This results in an empty commit which is not similar to what rebase or evolve will generally result in after `D7631` unless `ui.allowemptycommit=True` is set. I think good behavior is to obsolete the absorbed changeset in favour of either it's parent or one of the revs in which it was absorbed.
I made a related comment on the parent patch before I realized that this patch adds obsmarker handling. My suggestion there was to mark all the commits that got absorbed into as successors, and if there's anything left in the absorbed commit, that would be yet another successor. Would that work?
CHANGES SINCE LAST ACTION
To: rdamazio, #hg-reviewers
Cc: pulkit, martinvonz, mercurial-devel
More information about the Mercurial-devel