Mercurial > hg
view tests/test-merge-force @ 6281:3e5f99b13998
convert: avoid querying log of foreign svn branches
Server configuration may prevent access to other branches, so don't even try to
get them, instead of ignoring them afterwards.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 16 Mar 2008 00:35:14 +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