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

#require unix-permissions no-root

     2

     3

  $ hg init a

     4

  $ cd a

     5

  $ echo foo > b

     6

  $ hg add b

     7

  $ hg ci -m "b"

     8

     9

  $ chmod -w .hg/store

    10

    11

  $ cd ..

    12

    13

  $ hg clone a b

    14

  requesting all changes

    15

  adding changesets

    16

  adding manifests

    17

  adding file changes

    18

  added 1 changesets with 1 changes to 1 files

    19

  new changesets 97310831fa1a

    20

  updating to branch default

    21

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

    22

    23

  $ chmod +w a/.hg/store # let test clean up

    24

    25

  $ cd b

    26

  $ hg verify

    27

  checking changesets

    28

  checking manifests

    29

  crosschecking files in changesets and manifests

    30

  checking files

    31

  1 files, 1 changesets, 1 total revisions

    32

    33

  $ cd ..