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

  $ for i in aaa zzz; do

     2

  >     hg init t

     3

  >     cd t

     4

  > 

     5

  >     echo

     6

  >     echo "-- With $i"

     7

  > 

     8

  >     touch file

     9

  >     hg add file

    10

  >     hg ci -m "Add"

    11

  > 

    12

  >     hg cp file $i

    13

  >     hg ci -m "a -> $i"

    14

  > 

    15

  >     hg cp $i other-file

    16

  >     echo "different" >> $i

    17

  >     hg ci -m "$i -> other-file"

    18

  > 

    19

  >     hg cp other-file somename

    20

  > 

    21

  >     echo "Status":

    22

  >     hg st -C

    23

  >     echo

    24

  >     echo "Diff:"

    25

  >     hg diff -g

    26

  > 

    27

  >     cd ..

    28

  >     rm -rf t

    29

  > done

    30

    31

  -- With aaa

    32

  Status:

    33

  A somename

    34

    other-file

    35

    36

  Diff:

    37

  diff --git a/other-file b/somename

    38

  copy from other-file

    39

  copy to somename

    40

    41

  -- With zzz

    42

  Status:

    43

  A somename

    44

    other-file

    45

    46

  Diff:

    47

  diff --git a/other-file b/somename

    48

  copy from other-file

    49

  copy to somename

    50

    51