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

[marmoute (Pierre-Yves David)]

marmoute added inline comments.

INLINE COMMENTS

> Alphare wrote in commit.py:217
> 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

Yeah the removed/added case are not tested yet. I'll just drop them from this patch and reintroduce them later with the testing.

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://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220203/66274487/attachment-0002.html>