[PATCH] tests: unify test-issue619

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1283594002 -7200
# Node ID ced23cfdc82a6d6c5ea8a8c5547dd61cb7011ffc
# Parent  7fd57d81f0056c5eabbef4bf76d070b6ddd06563
tests: unify test-issue619

diff --git a/tests/test-issue619.out b/tests/test-issue619.out
deleted file mode 100644
--- a/tests/test-issue619.out
+++ /dev/null
@@ -1,10 +0,0 @@
-adding a
-marked working directory as branch b
-adding b
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-fast-forward
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-bogus fast-forward should fail
-abort: merging with a working directory ancestor has no effect
-done
diff --git a/tests/test-issue619 b/tests/test-issue619.t
old mode 100755
new mode 100644
rename from tests/test-issue619
rename to tests/test-issue619.t
--- a/tests/test-issue619
+++ b/tests/test-issue619.t
@@ -1,20 +1,30 @@
-#!/bin/sh
+# http://mercurial.selenic.com/bts/issue619
 
-mkdir t
-cd t
-hg init
-echo a > a
-hg ci -Ama
-echo b > b
-hg branch b
-hg ci -Amb
-hg co -C 0
+  $ hg init
+  $ echo a > a
+  $ hg ci -Ama
+  adding a
 
-echo fast-forward
-hg merge b
-hg ci -Ammerge
+  $ echo b > b
+  $ hg branch b
+  marked working directory as branch b
+  $ hg ci -Amb
+  adding b
 
-echo bogus fast-forward should fail
-hg merge b
+  $ hg co -C 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
-echo done
+Fast-forward:
+
+  $ hg merge b
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg ci -Ammerge
+
+Bogus fast-forward should fail:
+
+  $ hg merge b
+  abort: merging with a working directory ancestor has no effect
+
+  $ true
+