merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED ACTION_GET represents that either the file is created on remote or it's newer on the remote side. However, since we have a ACTION_DELETE_CHANGED too, it means the file is not present locally and ACTION_GET is representing that file was created on remote. Having both ACTION_GET and ACTION_DELETED_CHANGED is conflicting because one says that file was created on remote and other says file has delete-changed conflicts. Let's choose ACTION_DELETED_CHANGED which will result in conflicts and make user choose the right way forward.

     1

  $ hg init

     2

  $ touch unknown

     3

     4

  $ touch a

     5

  $ hg add a

     6

  $ hg ci -m "1"

     7

     8

  $ touch b

     9

  $ hg add b

    10

  $ hg ci -m "2"

    11

    12

Should show unknown

    13

    14

  $ hg status

    15

  ? unknown

    16

  $ hg revert -r 0 --all

    17

  removing b

    18

    19

Should show unknown and b removed

    20

    21

  $ hg status

    22

  R b

    23

  ? unknown

    24

    25

Should show a and unknown

    26

    27

  $ ls -A

    28

  .hg

    29

  a

    30

  unknown