[PATCH] tests: unify test-confused-revert

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1284492365 -7200
# Node ID 60f22e8c99e5de1e1b7c9f6000e6386fbcde679c
# Parent  8f1c61a5d971d68d91abaa992cca5af309199276
tests: unify test-confused-revert

diff --git a/tests/test-confused-revert.out b/tests/test-confused-revert.out
deleted file mode 100644
--- a/tests/test-confused-revert.out
+++ /dev/null
@@ -1,29 +0,0 @@
-%%% should show a removed and b added
-A b
-R a
-reverting...
-undeleting a
-forgetting b
-%%% should show b unknown and a back to normal
-? b
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-created new head
-merging a
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-%%% should show foo-b
-foo-b
-%%% should show a removed and b added
-A b
-R a
-%%% revert should fail
-abort: uncommitted merge - please provide a specific revision
-%%% revert should be ok now
-undeleting a
-forgetting b
-%%% should show b unknown and a marked modified (merged)
-M a
-? b
-%%% should show foo-b
-foo-b
diff --git a/tests/test-confused-revert b/tests/test-confused-revert.t
old mode 100755
new mode 100644
rename from tests/test-confused-revert
rename to tests/test-confused-revert.t
--- a/tests/test-confused-revert
+++ b/tests/test-confused-revert.t
@@ -1,55 +1,80 @@
-#!/bin/sh
+  $ hg init
+  $ echo foo > a
+  $ hg add a
+  $ hg commit -m "1"
 
-hg init
-echo foo > a
-hg add a
-hg commit -m "1"
+  $ echo bar > b
+  $ hg add b
+  $ hg remove a
 
-echo bar > b
-hg add b
-hg remove a
+Should show a removed and b added:
 
-echo "%%% should show a removed and b added"
-hg status
+  $ hg status
+  A b
+  R a
 
-echo "reverting..."
-hg revert --all
+  $ hg revert --all
+  undeleting a
+  forgetting b
 
-echo "%%% should show b unknown and a back to normal"
-hg status
+Should show b unknown and a back to normal:
 
-rm b
+  $ hg status
+  ? b
 
-hg co -C 0
-echo foo-a > a
-hg commit -m "2a"
+  $ rm b
 
-hg co -C 0
-echo foo-b > a
-hg commit -m "2b"
+  $ hg co -C 0
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo foo-a > a
+  $ hg commit -m "2a"
 
-HGMERGE=true hg merge 1
+  $ hg co -C 0
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo foo-b > a
+  $ hg commit -m "2b"
+  created new head
 
-echo "%%% should show foo-b"
-cat a
+  $ HGMERGE=true hg merge 1
+  merging a
+  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
 
-echo bar > b
-hg add b
-rm a
-hg remove a
+Should show foo-b:
 
-echo "%%% should show a removed and b added"
-hg status
+  $ cat a
+  foo-b
 
-echo "%%% revert should fail"
-hg revert --all
+  $ echo bar > b
+  $ hg add b
+  $ rm a
+  $ hg remove a
 
-echo "%%% revert should be ok now"
-hg revert -r2 --all
+Should show a removed and b added:
 
-echo "%%% should show b unknown and a marked modified (merged)"
-hg status
+  $ hg status
+  A b
+  R a
 
-echo "%%% should show foo-b"
-cat a
+Revert should fail:
 
+  $ hg revert --all
+  abort: uncommitted merge - please provide a specific revision
+
+Revert should be ok now:
+
+  $ hg revert -r2 --all
+  undeleting a
+  forgetting b
+
+Should show b unknown and a marked modified (merged):
+
+  $ hg status
+  M a
+  ? b
+
+Should show foo-b:
+
+  $ cat a
+  foo-b
+