Fix handling of paths when run outside the repo. The main problem was that dirstate.getcwd() returned just "", which was interpreted as "we're at the repo root". It now returns an absolute path. The util.pathto function was also changed to deal with the "cwd is an absolute path" case.

     1

#!/bin/sh

     2

     3

mkdir r1

     4

cd r1

     5

hg init

     6

mkdir a

     7

echo foo > a/f

     8

hg add a

     9

hg ci -m "a/f == foo"

    10

cd ..

    11

    12

hg clone r1 r2

    13

cd r2

    14

hg mv a b

    15

echo foo1 > b/f

    16

hg ci -m" a -> b, b/f == foo1"

    17

cd ..

    18

    19

cd r1

    20

mkdir a/aa

    21

echo bar > a/aa/g

    22

hg add a/aa

    23

hg ci -m "a/aa/g"

    24

hg pull ../r2

    25

    26

hg merge

    27

    28

hg st -C