convert: clear the dirstate before a conversion, invalidate it afterwards Clearing it before the conversion protects us from whatever data were there (file copies in particular). Invalidating it after the conversion avoids writing a possibly inconsistent dirstate to disk.

     1

#!/bin/sh

     2

#

     3

     4

hg init t

     5

cd t

     6

echo 1 > foo

     7

hg ci -Am m

     8

     9

cd ..

    10

hg clone t tt

    11

cd tt

    12

echo 1.1 > foo

    13

hg ci -Am m

    14

    15

cd ../t

    16

echo 1.2 > foo

    17

hg ci -Am m

    18

echo % should fail

    19

hg pull -u ../tt

    20

    21

cd ../tt

    22

echo % should fail

    23

hg pull -u ../t

    24

HGMERGE=true hg merge

    25

hg ci -mm

    26

    27

cd ../t

    28

echo % should work

    29

hg pull -u ../tt