author | Paolo Giarrusso <p.giarrusso@gmail.com> |
Sat, 21 Aug 2010 00:33:13 +0200 | |
branch | stable |
changeset 12218 | 0bd15f88e8eb |
parent 6256 | 69c75d063c7a |
permissions | -rwxr-xr-x |
#!/bin/sh hg init repo cd repo echo a > a hg ci -qAm 'add a' echo b > b hg ci -qAm 'add b' hg up -qC 0 hg rm a hg ci -m 'rm a' hg up -qC 1 rm a echo '% local deleted a file, remote removed' hg merge # should fail, since there are deleted files hg -v merge --force echo % should show a as removed hg st hg ci -m merge echo % manifest. should not have a: hg manifest