Mercurial > hg
view tests/test-merge-force @ 6283:5a45c82fc7da
Revert cfebb175704f, fixing the output of 2 tests
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 15 Mar 2008 22:03:18 -0300 |
parents | 69c75d063c7a |
children |
line wrap: on
line source
#!/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