author | Bryan O'Sullivan <bos@serpentine.com> |
Wed, 07 Nov 2007 17:40:39 -0800 | |
changeset 5512 | 8cd26ccc68f8 |
parent 5207 | 212de429e000 |
child 5688 | 883d887c6408 |
permissions | -rwxr-xr-x |
#!/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