merge: use constants for actions We finish up establishing named constants in this file with actions. I remember scratching my head trying to figure out what this code was doing as part of addressing a recent security issue with subrepos. Having the named constants in place definitely makes things easier to read. I'm not convinced the new constants have the best names (I'm not an expert in this code). But they can be changed easily enough. Also, since these constants are internal only, we might want to change their values to something more human readable to facilitate debugging. Or maybe we could employ an enum type some day... Differential Revision: https://phab.mercurial-scm.org/D2701

     1

running: init test1

     2

result: None

     3

running: add foo

     4

result: 0

     5

running: commit -m commit1 -d 2000-01-01 foo

     6

result: None

     7

running: commit -m commit2 -d 2000-01-02 foo

     8

result: None

     9

running: log -r 0

    10

changeset:   0:0e4634943879

    11

user:        test

    12

date:        Sat Jan 01 00:00:00 2000 +0000

    13

summary:     commit1

    14

    15

result: None

    16

running: log -r tip

    17

changeset:   1:45589e459b2e

    18

tag:         tip

    19

user:        test

    20

date:        Sun Jan 02 00:00:00 2000 +0000

    21

summary:     commit2

    22

    23

result: None