[PATCH] tests: unify test-merge-revert

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1284293422 -7200
# Node ID 6a37ebc81c7ddfb7a419000e3e9db6aea9120f6b
# Parent  897a1c50464c46ef287b4bf102b17d1debfccf70
tests: unify test-merge-revert

diff --git a/tests/test-merge-revert.out b/tests/test-merge-revert.out
deleted file mode 100644
--- a/tests/test-merge-revert.out
+++ /dev/null
@@ -1,23 +0,0 @@
-1:08a16e8e4408
-0:d29c767a4b52
-08a16e8e4408 tip
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-d29c767a4b52
-d29c767a4b52+
-reverting file1
-? file1.orig
-d29c767a4b52
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-? file1.orig
-08a16e8e4408 tip
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-? file1.orig
-08a16e8e4408 tip
-? file1.orig
-08a16e8e4408 tip
-? file1.orig
-08a16e8e4408 tip
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-? file1.orig
-08a16e8e4408 tip
diff --git a/tests/test-merge-revert b/tests/test-merge-revert.t
old mode 100755
new mode 100644
rename from tests/test-merge-revert
rename to tests/test-merge-revert.t
--- a/tests/test-merge-revert
+++ b/tests/test-merge-revert.t
@@ -1,44 +1,74 @@
-#!/bin/sh
+  $ hg init
 
-mkdir t
-cd t
-hg init
-echo "added file1" > file1
-echo "added file2" > file2
-hg add file1 file2
-hg commit -m "added file1 and file2"
-echo "changed file1" >> file1
-hg commit -m "changed file1"
-hg -q log
-hg id
-hg update -C 0
-hg id
-echo "changed file1" >> file1
-hg id
-hg revert --all
-hg diff
-hg status
-hg id
-hg update
-hg diff
-hg status
-hg id
-hg update -C 0
-echo "changed file1" >> file1
-hg update
-hg diff
-hg status
-hg id
-hg revert --all
-hg diff
-hg status
-hg id
-hg revert -r tip --all
-hg diff
-hg status
-hg id
-hg update -C
-hg diff
-hg status
-hg id
+  $ echo "added file1" > file1
+  $ echo "added file2" > file2
+  $ hg add file1 file2
+  $ hg commit -m "added file1 and file2"
 
+  $ echo "changed file1" >> file1
+  $ hg commit -m "changed file1"
+
+  $ hg -q log
+  1:08a16e8e4408
+  0:d29c767a4b52
+  $ hg id
+  08a16e8e4408 tip
+
+  $ hg update -C 0
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg id
+  d29c767a4b52
+  $ echo "changed file1" >> file1
+  $ hg id
+  d29c767a4b52+
+
+  $ hg revert --all
+  reverting file1
+  $ hg diff
+  $ hg status
+  ? file1.orig
+  $ hg id
+  d29c767a4b52
+
+  $ hg update
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg diff
+  $ hg status
+  ? file1.orig
+  $ hg id
+  08a16e8e4408 tip
+
+  $ hg update -C 0
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo "changed file1" >> file1
+
+  $ hg update
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg diff
+  $ hg status
+  ? file1.orig
+  $ hg id
+  08a16e8e4408 tip
+
+  $ hg revert --all
+  $ hg diff
+  $ hg status
+  ? file1.orig
+  $ hg id
+  08a16e8e4408 tip
+
+  $ hg revert -r tip --all
+  $ hg diff
+  $ hg status
+  ? file1.orig
+  $ hg id
+  08a16e8e4408 tip
+
+  $ hg update -C
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg diff
+  $ hg status
+  ? file1.orig
+  $ hg id
+  08a16e8e4408 tip
+