Mercurial > hg
view tests/test-add @ 6006:3c9dbb743d20
merge: add registry look up bits to tool search
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 03 Feb 2008 19:29:05 -0600 |
parents | 883d887c6408 |
children | 7c36a4fb05a3 |
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 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