tests/test-merge4
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 28 Aug 2006 21:49:02 +0200
changeset 3016 aebc3f64b20f
parent 2283 e506c14382fd
permissions -rwxr-xr-x
fix incorrect warning when walking on a particular rev when a directory was given instead of a file it reported incorrectly 'No such file or directory in rev <rev>' we test if the file is a prefix directory

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"