Mercurial > hg
view tests/test-merge-force @ 7465:8f0305874701
tests: allow cvs import to reorder its filename list
Also fix script to generate non-zero length test file b.
author | Frank Kingswood <frank@kingswood-consulting.co.uk> |
---|---|
date | Mon, 01 Dec 2008 13:42:04 +0000 |
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