[PATCH] tests: unify test-manifest-merging

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1284188150 -7200
# Node ID 9e596488132e83c3ce32fdcffce4bad35b7b68ad
# Parent  6b8d1d3584ec086ec57a83d0ac7dddfd3d85b13d
tests: unify test-manifest-merging

diff --git a/tests/test-manifest-merging.out b/tests/test-manifest-merging.out
deleted file mode 100644
--- a/tests/test-manifest-merging.out
+++ /dev/null
@@ -1,15 +0,0 @@
-% init foo-base
-% create alpha in first repo
-adding alpha
-% clone foo-base to foo-work
-updating to branch default
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% create beta in second repo
-adding beta
-% create gamma in first repo
-adding gamma
-% pull into work and merge
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-% revert to changeset 1 to simulate a failed merge
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-manifest-merging b/tests/test-manifest-merging.t
old mode 100755
new mode 100644
rename from tests/test-manifest-merging
rename to tests/test-manifest-merging.t
--- a/tests/test-manifest-merging
+++ b/tests/test-manifest-merging.t
@@ -1,34 +1,36 @@
-#!/bin/sh
+  $ hg init base
 
-echo % init foo-base
-hg init foo-base
+  $ cd base
+  $ echo 'alpha' > alpha
+  $ hg ci -A -m 'add alpha'
+  adding alpha
+  $ cd ..
 
-echo % create alpha in first repo
-cd foo-base
-echo 'alpha' > alpha
-hg ci -A -m 'add alpha' -d '1 0'
-cd ..
+  $ hg clone base work
+  updating to branch default
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-echo % clone foo-base to foo-work
-hg clone foo-base foo-work
+  $ cd work
+  $ echo 'beta' > beta
+  $ hg ci -A -m 'add beta'
+  adding beta
+  $ cd ..
 
-echo % create beta in second repo
-cd foo-work
-echo 'beta' > beta
-hg ci -A -m 'add beta' -d '2 0'
-cd ..
+  $ cd base
+  $ echo 'gamma' > gamma
+  $ hg ci -A -m 'add gamma'
+  adding gamma
+  $ cd ..
 
-echo % create gamma in first repo
-cd foo-base
-echo 'gamma' > gamma
-hg ci -A -m 'add gamma' -d '3 0'
-cd ..
+  $ cd work
+  $ hg pull -q
+  $ hg merge
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
 
-echo % pull into work and merge
-cd foo-work
-hg pull -q
-hg merge
+Update --clean to revision 1 to simulate a failed merge:
 
-echo % revert to changeset 1 to simulate a failed merge
-rm alpha beta gamma
-hg up -C 1
+  $ rm alpha beta gamma
+  $ hg update --clean 1
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+