[Updated] D12119: narrow: allow merging non-conflicting change outside of the narrow spec

[Alphare (Raphaël Gomès)]

This revision now requires changes to proceed.
Alphare added a comment.
Alphare requested changes to this revision.


  I don't think we can forgo a test of a simple added and removed case.

INLINE COMMENTS

> commit.py:217
> +                removed.append(f)
> +            elif narrow_action == mergestate.CHANGE_REMOVED:
> +                files.mark_added(f)

Should be `mergestate.CHANGE_ADDED`. This makes me suspect that the testing is not extensive enough even with the limited scope mentioned in the commit message

> commit.py:230
> +            else:
> +                msg = _(b"corrupted mergestate, unkown narrow action: %b")
> +                hint = _(b"restart the merge")

unknown*

REPOSITORY
  rHG Mercurial

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

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

To: marmoute, durin42, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20220203/2ad5a958/attachment.html>