changeset 6255 | ae83d927c629 |
child 6256 | 69c75d063c7a |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-force Fri Mar 14 09:56:58 2008 -0300 @@ -0,0 +1,26 @@ +#!/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 -v merge +echo % should show a as removed +hg st + +hg ci -m merge +echo % manifest. should not have a: +hg manifest