D7630: absorb: make the absorbed changeset be automatically "evolved"

marmoute (Pierre-Yves David) phabricator at mercurial-scm.org
Thu Jan 23 11:37:44 EST 2020


marmoute added a comment.


  In D7630#115320 <https://phab.mercurial-scm.org/D7630#115320>, @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?
  >
  > Yep, that sounds good.
  
  This means generate split+fold markers. That is going to be fun to deal with :-). I dont' really have any much better idea however (the alternative seems to use simple prune markers, which is meh).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7630/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7630

To: rdamazio, #hg-reviewers
Cc: marmoute, pulkit, martinvonz, mercurial-devel


More information about the Mercurial-devel mailing list