Mercurial > hg
view tests/test-merge-force @ 10782:f58d5fbd941c stable
i18n-sv: translated the 'patterns' command
author | Jens Bäckman <jens.backman@gmail.com> |
---|---|
date | Sun, 28 Mar 2010 20:27:09 +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