Mercurial > hg
view tests/test-merge-force @ 9743:bae76e97f91a
hgrc.5: order of email charsets is not a top level literal block
- it belongs under email charsets, not email in general
- enumerate order
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Sat, 07 Nov 2009 13:54:47 +0100 |
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