author | Tobias Bell <tobias.bell@gmail.com> |
Fri, 03 Apr 2009 22:35:07 +0200 | |
changeset 7964 | 4946ecb3c6fa |
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