[Updated] D12002: precheck: fix false warning about content-divergence creation

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Tue Jan 25 17:30:56 UTC 2022


This revision now requires changes to proceed.
martinvonz added inline comments.
martinvonz requested changes to this revision.

INLINE COMMENTS

> rewriteutil.py:89
> +    # Adding a prune marker (A, ()) to obsstore can't be diverging
> +    if action == b'prune' and not successors:
> +        return

Depending on `action` seems ugly. What if I create my own `hg pare` command with similar behavior, then I still need to pass "prune" here and my users would see that in error messages? Also `successors` is used only here... Can we simply pass a `check_divergence=True` instead?

REPOSITORY
  rHG Mercurial

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

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

To: khanchi97, #hg-reviewers, martinvonz
Cc: martinvonz, mharbison72, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220125/badfd3eb/attachment-0002.html>


More information about the Mercurial-patches mailing list