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

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Tue Dec 17 07:29:24 EST 2019


pulkit added a comment.


  Can you describe the feature a bit in the commit message. Specific things which I feel are missing:
  
  - what happens to wdir changes
  - what happens if source is a commit is not a head
  
  I understand them but after reading the tests, so might be worth to add them to description.
  
  Also, it will be nice if you add an entry in releasenotes.

INLINE COMMENTS

> absorb.py:993
>              raise error.Abort(_(b'cannot absorb into a merge'))
> +        if len(targetctx.parents()) > 1:
> +            raise error.Abort(_(b'cannot absorb a merge'))

need to do more checks here about being public commit etc. `rewriteutil.precheck` should help.

> test-absorb-rev.t:73
> +
> +  $ grep 6 a
> +  6

`hg status|diff` should be a better command here.

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: pulkit, quark, mercurial-devel


More information about the Mercurial-devel mailing list