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

  $ rm -rf a

     2

  $ hg init a

     3

  $ cd a

     4

  $ echo a > a

     5

  $ hg ci -Am0

     6

  adding a

     7

  $ hg tag t1 # 1

     8

  $ hg tag --remove t1 # 2

     9

    10

  $ hg co 1

    11

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

    12

  $ hg tag -f -r0 t1

    13

  $ hg tags

    14

  tip                                3:a49829c4fc11

    15

  t1                                 0:f7b1eb17ad24

    16

    17

  $ cd ..