view tests/test-add @ 7162:ce10a2f22258

mq: heavy rearrangement of qnew to make it recover reliably from errors. Closes issue1269.
author Brendan Cully <brendan@kublai.com>
date Sat, 18 Oct 2008 21:52:22 -0700
parents 7c36a4fb05a3
children b9a8b616521d
line wrap: on
line source

#!/bin/sh

hg init a
cd a
echo a > a
hg add -n
hg st
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
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 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