[Commented On] D8940: merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally

[marmoute (Pierre-Yves David)]

marmoute added a comment.


  So right now the bid merge still behave in a bad way (delete the file instead of conflicting, but at least not it consistently does so regardless of where the merge is started?
  
  If so, please update the changeset description to point this out.
  
  I am also pondering if we should have a summary of the current issues within the test file, so that we can clean up while fixing this.

REPOSITORY
  rHG Mercurial

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

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

To: pulkit, #hg-reviewers
Cc: marmoute, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200911/6a84e649/attachment.html>