filemerge: when using in-memory merge, always put backup files in temp dir Before calling a merge tool, we create a backup of the local side of the merge. That file can be put in the working copy or in a temporary directory, depending on the user's config. When we're merging in memory, we don't want to write to the actual, on-disk working copy, so we write the file to the in-memory working copy instead. However, since we don't support external merge tools with in-memory merge, it makes no difference where the file is actually stored (and if we ever do add support for external merge tools, then the file clearly can't live in the in-memory working-copy object anyway). So, since it doesn't matter where the file is stored, we can simplify by always putting them in the system's temp directory. Differential Revision: https://phab.mercurial-scm.org/D12187

     1

  $ hg init

     2

     3

  $ echo 123 > a

     4

  $ hg add a

     5

  $ hg commit -m "first" a

     6

     7

  $ mkdir sub

     8

  $ echo 321 > sub/b

     9

  $ hg add sub/b

    10

  $ hg commit -m "second" sub/b

    11

    12

  $ cat sub/b

    13

  321

    14

    15

  $ hg co 0

    16

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

    17

    18

  $ cat sub/b 2>/dev/null || echo "sub/b not present"

    19

  sub/b not present

    20

    21

  $ test -d sub || echo "sub not present"

    22

  sub not present

    23