Mercurial > hg
view tests/test-merge-force @ 8307:2bb6548a8fa6
zeroconf: remove unwarranted execute bit
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 07 May 2009 19:08:25 +0200 |
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