[PATCH] tests: unify test-merge-force

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1284220717 -7200
# Node ID caa552c7480fe72ebb78ebca421a8213e6d04a7a
# Parent  39df8f325780aa342628c2a1addd6f68ee31f154
tests: unify test-merge-force

diff --git a/tests/test-merge-force.out b/tests/test-merge-force.out
deleted file mode 100644
--- a/tests/test-merge-force.out
+++ /dev/null
@@ -1,11 +0,0 @@
-created new head
-% local deleted a file, remote removed
-abort: outstanding uncommitted changes (use 'hg status' to list changes)
-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
diff --git a/tests/test-merge-force b/tests/test-merge-force.t
old mode 100755
new mode 100644
rename from tests/test-merge-force
rename to tests/test-merge-force.t
--- a/tests/test-merge-force
+++ b/tests/test-merge-force.t
@@ -1,27 +1,43 @@
-#!/bin/sh
+  $ hg init
 
-hg init repo
-cd repo
+  $ echo a > a
+  $ hg ci -qAm 'add a'
 
-echo a > a
-hg ci -qAm 'add a'
+  $ echo b > b
+  $ hg ci -qAm 'add b'
 
-echo b > b
-hg ci -qAm 'add b'
+  $ hg up -qC 0
+  $ hg rm a
+  $ hg ci -m 'rm a'
+  created new head
 
-hg up -qC 0
-hg rm a
-hg ci -m 'rm a'
+  $ hg up -qC 1
+  $ rm a
 
-hg up -qC 1
-rm a
+Local deleted a file, remote removed
 
-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
+Should fail, since there are deleted files:
 
-hg ci -m merge
-echo % manifest. should not have a:
-hg manifest
+  $ hg merge
+  abort: outstanding uncommitted changes (use 'hg status' to list changes)
+
+Should succeed with --force:
+
+  $ hg -v merge --force
+  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:
+
+  $ hg status
+  R a
+
+  $ hg ci -m merge
+
+Should not show 'a':
+
+  $ hg manifest
+  b
+