view tests/test-unrelated-pull @ 5242:9cd6578750b9

improve error message for 'hg merge' when repo already at branchtip
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 25 Aug 2007 11:30:11 +0200
parents dac4bd67f6c5
children 4c94b6d0fb1c
line wrap: on
line source

#!/bin/sh

mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -m "a" -u a -d "1000000 0"

cd ..
mkdir b
cd b
hg init
echo 321 > b
hg add b
hg commit -m "b" -u b -d "1000000 0"

hg pull ../a
hg pull -f ../a
hg heads