[PATCH] tests: unify test-unrelated-pull

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1284453265 -7200
# Node ID 4a6aa50f226dc9a8a28cb0533a227d36ddf30880
# Parent  8d6716372ca7828ce9176edade41d5978209368b
tests: unify test-unrelated-pull

diff --git a/tests/test-unrelated-pull.out b/tests/test-unrelated-pull.out
deleted file mode 100644
--- a/tests/test-unrelated-pull.out
+++ /dev/null
@@ -1,23 +0,0 @@
-pulling from ../a
-searching for changes
-abort: repository is unrelated
-pulling from ../a
-searching for changes
-warning: repository is unrelated
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files (+1 heads)
-(run 'hg heads' to see heads, 'hg merge' to merge)
-changeset:   1:9a79c33a9db3
-tag:         tip
-parent:      -1:000000000000
-user:        a
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     a
-
-changeset:   0:01f8062b2de5
-user:        b
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     b
-
diff --git a/tests/test-unrelated-pull b/tests/test-unrelated-pull.t
old mode 100755
new mode 100644
rename from tests/test-unrelated-pull
rename to tests/test-unrelated-pull.t
--- a/tests/test-unrelated-pull
+++ b/tests/test-unrelated-pull.t
@@ -1,20 +1,43 @@
-#!/bin/sh
+  $ mkdir a
+  $ cd a
+  $ hg init
+  $ echo 123 > a
+  $ hg add a
+  $ hg commit -m "a" -u a
 
-mkdir a
-cd a
-hg init
-echo 123 > a
-hg add a
-hg commit -m "a" -u a
+  $ cd ..
+  $ mkdir b
+  $ cd b
+  $ hg init
+  $ echo 321 > b
+  $ hg add b
+  $ hg commit -m "b" -u b
 
-cd ..
-mkdir b
-cd b
-hg init
-echo 321 > b
-hg add b
-hg commit -m "b" -u b
+  $ hg pull ../a
+  pulling from ../a
+  searching for changes
+  abort: repository is unrelated
 
-hg pull ../a
-hg pull -f ../a
-hg heads
+  $ hg pull -f ../a
+  pulling from ../a
+  searching for changes
+  warning: repository is unrelated
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files (+1 heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
+
+  $ hg heads
+  changeset:   1:9a79c33a9db3
+  tag:         tip
+  parent:      -1:000000000000
+  user:        a
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     a
+  
+  changeset:   0:01f8062b2de5
+  user:        b
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     b
+