diff --git a/tests/test-merge-force b/tests/test-merge-force new file mode 100755 --- /dev/null +++ b/tests/test-merge-force @@ -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 diff --git a/tests/test-merge-force.out b/tests/test-merge-force.out new file mode 100644 --- /dev/null +++ b/tests/test-merge-force.out @@ -0,0 +1,9 @@ +% local deleted a file, remote removed +resolving manifests +removing a +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +(branch merge, don't forget to commit) +% should show a as removed +R a +% manifest. should not have a: +b