Mercurial > hg
view tests/test-add @ 7952:b214066b7e1d
rebase: store/restore arguments correctly
Keep and keepbranches were lost after an interruption
author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
---|---|
date | Sun, 29 Mar 2009 14:43:49 +0200 |
parents | 7c36a4fb05a3 |
children | b9a8b616521d |
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 resolve -m a 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