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

  $ echo This is file a1 > a

     3

  $ echo This is file b1 > b

     4

  $ hg add a b

     5

  $ hg commit -m "commit #0"

     6

  $ echo This is file b22 > b

     7

  $ hg commit -m "comment #1"

     8

  $ hg update 0

     9

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

    10

  $ rm b

    11

  $ hg commit -A -m "comment #2"

    12

  removing b

    13

  created new head

    14

  $ hg update 1

    15

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

    16

  $ rm b

    17

  $ hg update -c 2

    18

  abort: uncommitted changes

    19

  [20]

    20

  $ hg revert b

    21

  $ hg update -c 2

    22

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

    23

  $ mv a c

    24

    25

Should abort:

    26

    27

  $ hg update 1

    28

  abort: uncommitted changes

    29

  (commit or update --clean to discard changes)

    30

  [255]

    31

  $ mv c a

    32

    33

Should succeed:

    34

    35

  $ hg update 1

    36

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