view tests/test-copy-move-merge @ 10358:d42821cd5c96

pull: with -u and -r, update to the first revision given

This makes pull consistent with clone. The actual change is in
mercurial.hg.parseurl, changing its checkout result, which is only
used for pull.

#!/bin/sh

mkdir t
cd t
hg init

echo 1 > a
hg ci -qAm "first" -d "1000000 0"

hg cp a b
hg mv a c
echo 2 >> b
echo 2 >> c

hg ci -qAm "second" -d "1000000 0"

hg co -C 0

echo 0 > a
echo 1 >> a

hg ci -qAm "other" -d "1000000 0"

hg merge --debug

echo "-- b --"
cat b

echo "-- c --"
cat c