# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1205499418 10800
# Node ID ae83d927c629f44c30dc06e5126faa61ac12d967
# Parent  3667b6e4bbd0c9805d50356c5c679504d5f2ca8d
add a test for a375ffc2aa1b

diff -r 3667b6e4bbd0 -r ae83d927c629 tests/test-merge-force
--- /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
diff -r 3667b6e4bbd0 -r ae83d927c629 tests/test-merge-force.out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge-force.out	Fri Mar 14 09:56:58 2008 -0300
@@ -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