Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.

     1

#!/bin/sh

     2

     3

mkdir t

     4

cd t

     5

hg init

     6

hg id

     7

echo a > a

     8

hg add a

     9

hg commit -m "test" -d "0 0"

    10

hg co

    11

hg identify

    12

T=`hg -q tip | cut -d : -f 2`

    13

echo "$T first" > .hgtags

    14

cat .hgtags

    15

hg add .hgtags

    16

hg commit -m "add tags" -d "0 0"

    17

hg tags

    18

hg identify

    19

echo bb > a

    20

hg status

    21

hg identify

    22

hg co first

    23

hg id

    24

hg -v id

    25

hg status

    26

echo 1 > b

    27

hg add b

    28

hg commit -m "branch" -d "0 0"

    29

hg id

    30

hg co -m 1

    31

hg id

    32

hg status

    33