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
$ hg init repo
$ cd repo
$ touch foo
$ hg ci -Am 'add foo'
adding foo
$ hg up -C null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
this should be stored as a delta against rev 0
$ echo foo bar baz > foo
$ hg ci -Am 'add foo again'
adding foo
created new head
$ hg debugindex foo
rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
1 0 13 ..... 1 0376abec49b8 000000000000 000000000000 (re)
$ cd ..