D7631: absorb: allowing committed changes to be absorbed into their ancestors

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Mon Jan 13 11:05:38 EST 2020


pulkit added inline comments.

INLINE COMMENTS

> rdamazio wrote in absorb.py:993
> Done. Notice that *technically* the user could do such an absorb while in the middle of a merge, but it sounds like a bad idea and inviting troubles, so I'm letting it also disallow that case. I'll be surprised if anyone even notices.

Sorry, I misunderstood the patch earlier. `rewriteutil.precheck` on target rev is not very helpful as we are not obsolete-ing that in this rev, but we are re-writing it's ancestors. So, if target-rev is a head, and `evolution.alloworphans=False` is set, it will still create orphans.

Not sure what's the best way forward, maybe we should do `rewriteutil.precheck` for the parent instead until we start obsoleting this rev.

> test-absorb-rev.t:72
>  Run absorb:
>  
> +  $ hg absorb --apply-changes -s .

I locally added some `hg log --graph` calls before and after absorb call to understand what happens. It will be nice to add them as it will make things easier for others to understand.

REPOSITORY
  rHG Mercurial

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

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

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


More information about the Mercurial-devel mailing list