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

https://bz.mercurial-scm.org/2493

     2

     3

Testing tagging with the EOL extension

     4

     5

  $ cat >> $HGRCPATH <<EOF

     6

  > [extensions]

     7

  > eol =

     8

  > 

     9

  > [eol]

    10

  > native = CRLF

    11

  > EOF

    12

    13

setup repository

    14

    15

  $ hg init repo

    16

  $ cd repo

    17

  $ cat > .hgeol <<EOF

    18

  > [patterns]

    19

  > ** = native

    20

  > EOF

    21

  $ printf "first\r\nsecond\r\nthird\r\n" > a.txt

    22

  $ hg commit --addremove -m 'checkin'

    23

  adding .hgeol

    24

  adding a.txt

    25

    26

Tag:

    27

    28

  $ hg tag 1.0

    29

    30

Rewrite .hgtags file as it would look on a new checkout:

    31

    32

  $ hg update -q null

    33

  $ hg update -q

    34

    35

Touch .hgtags file again:

    36

    37

  $ hg tag 2.0

    38

    39

  $ cd ..