comparison tests/test-merge-tools.t @ 26899:5f88e092f82c

resolve: don't abort when file is missing

A file being missing is a completely valid situation in which the user may want
to re-resolve merge conflicts. Mercurial already maintains backups of local
data, so this turns out to be easy to handle.

26898:33eb8a56d0c9

  # hg stat
  M f
  ? f.orig
  # hg resolve --list
  U f
ui.merge specifies internal:dump:

  $ beforemerge
  [merge-tools]
  false.whatever=

26899:5f88e092f82c

  # hg stat
  M f
  ? f.orig
  # hg resolve --list
  U f
  $ rm f
  $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
   no tool found to merge f
  keep (l)ocal or take (o)ther? 
  [1]
  $ aftermerge
  # cat f
  revision 1
  space
  # hg stat
  M f
  # hg resolve --list
  U f
  $ hg resolve --all --config ui.merge=internal:prompt
   no tool found to merge f
  keep (l)ocal or take (o)ther? l
  (no more unresolved files)
  $ aftermerge
  # cat f
  revision 1
  space
  # hg stat
  M f
  ? f.orig
  # hg resolve --list
  R f

ui.merge specifies internal:dump:

  $ beforemerge
  [merge-tools]
  false.whatever=