[PATCH] tests: unify test-issue612

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1283592783 -7200
# Node ID 7fd57d81f0056c5eabbef4bf76d070b6ddd06563
# Parent  8cef7d44704fd0b209a684a0413802caac67fd62
tests: unify test-issue612

diff --git a/tests/test-issue612.out b/tests/test-issue612.out
deleted file mode 100644
--- a/tests/test-issue612.out
+++ /dev/null
@@ -1,11 +0,0 @@
-adding src/a.c
-moving src/a.c to source/a.c
-1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-created new head
-? src/a.o
-merging src/a.c and source/a.c to source/a.c
-1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-M source/a.c
-R src/a.c
-? source/a.o
diff --git a/tests/test-issue612 b/tests/test-issue612.t
old mode 100755
new mode 100644
rename from tests/test-issue612
rename to tests/test-issue612.t
--- a/tests/test-issue612
+++ b/tests/test-issue612.t
@@ -1,24 +1,34 @@
-#!/bin/sh
+# http://mercurial.selenic.com/bts/issue612
 
-mkdir t
-cd t
+  $ hg init
+  $ mkdir src
+  $ echo a > src/a.c
+  $ hg ci -Ama
+  adding src/a.c
 
-hg init
-mkdir src
-echo a > src/a.c
-hg ci -Ama
+  $ hg mv src source
+  moving src/a.c to source/a.c
 
-hg mv src source
-hg ci -Ammove
+  $ hg ci -Ammove
 
-hg co -C 0
-echo new > src/a.c
-echo compiled > src/a.o
-hg ci -mupdate
+  $ hg co -C 0
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
-hg st
+  $ echo new > src/a.c
+  $ echo compiled > src/a.o
+  $ hg ci -mupdate
+  created new head
 
-hg merge
+  $ hg status
+  ? src/a.o
 
-hg st
+  $ hg merge
+  merging src/a.c and source/a.c to source/a.c
+  1 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
 
+  $ hg status
+  M source/a.c
+  R src/a.c
+  ? source/a.o
+