tests/test-pull-update
author Yuya Nishihara <yuya@tcha.org>
Fri, 02 Jul 2010 23:49:06 +0900
branchstable
changeset 11508 fbab0875fd09
parent 5080 73fdc8bd3ed8
permissions -rwxr-xr-x
log: fix missing diff output for hg log -p in sub directory prep(ctx, fns) receives paths relative to repository root, not cwd.

#!/bin/sh
#

hg init t
cd t
echo 1 > foo
hg ci -Am m

cd ..
hg clone t tt
cd tt
echo 1.1 > foo
hg ci -Am m

cd ../t
echo 1.2 > foo
hg ci -Am m
echo % should fail
hg pull -u ../tt

cd ../tt
echo % should fail
hg pull -u ../t
HGMERGE=true hg merge
hg ci -mm

cd ../t
echo % should work
hg pull -u ../tt