view tests/test-add @ 9434:f5ce9b052747

test-convert-git: Use ~ instead of ^ Solaris sh interprets ^ as pipe symbol and the test thus failed in strange ways. git can however use of HEAD~ instead of HEAD^.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 08 Sep 2009 01:26:15 +0200
parents b9a8b616521d
children e6162b854ed5
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
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