2007-08-21 04:13:32 +04:00
|
|
|
#!/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
|
2007-12-24 14:14:43 +03:00
|
|
|
hg add b || echo "failed to add b"
|
2007-08-21 04:13:32 +04:00
|
|
|
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
|
2008-08-14 05:18:40 +04:00
|
|
|
hg resolve -m a
|
2007-08-21 04:13:32 +04:00
|
|
|
hg ci -m merge
|
|
|
|
|
|
|
|
echo % issue683
|
|
|
|
hg rm a
|
|
|
|
hg st
|
|
|
|
echo a > a
|
|
|
|
hg add a
|
|
|
|
hg st
|
2007-12-24 14:14:43 +03:00
|
|
|
|
|
|
|
hg add c && echo "unexpected addition of missing file"
|
|
|
|
echo c > c
|
|
|
|
hg add d c && echo "unexpected addition of missing file"
|
|
|
|
hg st
|
|
|
|
|