view tests/test-add @ 10546:3a69afd6987e stable

fix test output changed by 2e1a9b811d13
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 25 Feb 2010 14:35:21 +0100
parents e6162b854ed5
children
line wrap: on
line source

#!/bin/sh

hg init a
cd a
echo a > a
hg add -n
hg st
hg add
hg st
hg forget a
hg add
hg st

echo b > b
hg add -n b
hg st
hg add b || echo "failed to add b"
hg st
echo % should fail
hg add b
hg st

hg ci -m 0 --traceback
echo % should fail
hg add a

echo aa > a
hg ci -m 1
hg up 0
echo aaa > a
hg ci -m 2

hg merge
hg st
echo % should fail
hg add a
hg st
hg resolve -m a
hg ci -m merge

echo % issue683
hg forget a
hg add a
hg st
hg rm a
hg st
echo a > a
hg add a
hg st

hg add c && echo "unexpected addition of missing file"
echo c > c
hg add d c && echo "unexpected addition of missing file"
hg st