Mercurial > hg

view tests/test-add @ 5624:3da5ff2a9b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
win32: it is no longer necessary to bundle patch.exe Mercurial can use it's built-in mpatch library
author Steve Borho <steve@borho.org>
date Fri, 07 Dec 2007 18:18:11 -0600
parents 212de429e000
children 883d887c6408
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
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 ci -m merge

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