tests/test-merge-remove

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge-remove	Tue Mar 18 04:07:39 2008 -0300
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+hg init repo
+cd repo
+
+echo foo > foo
+echo bar > bar
+hg ci -qAm 'add foo bar'
+
+echo foo2 >> foo
+echo bleh > bar
+hg ci -m 'change foo bar'
+
+hg up -qC 0
+hg mv foo foo1
+echo foo1 > foo1
+hg cat foo >> foo1
+hg ci -m 'mv foo foo1'
+
+hg merge
+hg debugstate --nodates
+hg st -q
+
+echo '% removing foo1 and bar'
+cp foo1 F
+cp bar B
+hg rm -f foo1 bar
+hg debugstate --nodates
+hg st -qC