merge: use constants for merge state record types merge.py is using multiple discrete sets of 1 and 2 letter constants to define types and behavior. To the uninitiated, the code is very difficult to reason about. I didn't even realize there were multiple sets of constants in play initially! We begin our sanity injection with merge state records. The record types (which are serialized to disk) are now defined in RECORD_* constants. Differential Revision: https://phab.mercurial-scm.org/D2698

     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