[Commented On] D8940: merge: store ACTION_KEEP when we are keeping the file deleted locally

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  In D8940#134074 <https://phab.mercurial-scm.org/D8940#134074>, @marmoute wrote:
  
  > Using ACTION_KEEP for a file that does not exist seems a bti scary. Did we not refactor the merge code to allow to express this ? (Do not touch working copy and dirstate, but something happened?)
  
  `ACTION_KEEP` is used for the same purpose: Do not touch working copy and dirstate, but something happened.
  
  We can have a more dedicated `ACTION_KEEP_DELETED`

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