test-revert: replace 'removed' in working copy with 'untracked-deleted' The 'wccontent' variable has eight different states, four of them tracked, and the other four untracked (at least when the file existed in the parent revision). Among these eight states, 'removed' sticks out by lacking the 'untracked-' prefix despite resulting in an untracked state. To make the symmetry clearer, and to prepare for future patches, rename 'removed' to 'untracked-deleted', which is exactly what it is. Note that, unlike 'remove', 'deleted' is configured in gen-revert-cases.py to have content in the working directory and that that content is instead expected to be removed in the test script. However, no changes are needed to the test script, since it already contains 'hg forget *untracked*' and 'rm *deleted*', which together have the same effect as 'hg remove'. See additional motivation in earlier patch.

     1

     2

== Local

     3

Ready.

     4

Un and Deux

     5

Eins und Zwei

     6

One and Two

     7

Nope

     8

Eins und Zwei

     9

Hello, John Smith

    10

Ready.

    11

Uno und Due

    12

    13

== Remote

    14

Ready.

    15

REQ: foo?one=Vo&two=Efvy

    16

  -> Vo!boe!Efvy

    17

Un and Deux

    18

REQ: bar?b=Fjot&a=[xfj

    19

  -> Fjot!voe![xfj

    20

Eins und Zwei

    21

REQ: batch?cmds=foo:one=Pof,two=Uxp;bar:b=Fjot,a=[xfj

    22

  -> Pof!boe!Uxp;Fjot!voe![xfj

    23

REQ: greet?name=Kpio!Tnjui

    24

  -> Ifmmp-!Kpio!Tnjui

    25

REQ: batch?cmds=bar:b=Vop,a=Evf

    26

  -> Vop!voe!Evf

    27

One and Two

    28

Nope

    29

Eins und Zwei

    30

Hello, John Smith

    31

Ready.

    32

Uno und Due