Mercurial > hg
view tests/test-merge-force @ 8671:a434c94b48e7
run-tests: show PID if running in parallel mode with -v.
(Extremely handy when you break parallel operation and need to figure
out what's going on. The assumption is that if you run with -v, you
want more details.)
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Fri, 29 May 2009 22:17:53 -0400 |
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