[PATCH] tests: unify test-update-renames

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1284471430 -7200
# Node ID 7ab21071291296de53bafaee7cf113390446d776
# Parent  8e1db301490828ab93e507e6b2b255e569ea5925
tests: unify test-update-renames

diff --git a/tests/test-update-renames.out b/tests/test-update-renames.out
deleted file mode 100644
--- a/tests/test-update-renames.out
+++ /dev/null
@@ -1,5 +0,0 @@
-merging a and b to b
-warning: conflicts during merge.
-merging b failed!
-0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
diff --git a/tests/test-update-renames b/tests/test-update-renames.t
old mode 100755
new mode 100644
rename from tests/test-update-renames
rename to tests/test-update-renames.t
--- a/tests/test-update-renames
+++ b/tests/test-update-renames.t
@@ -1,19 +1,29 @@
-#!/bin/sh
-
 # test update logic when there are renames
 
+# update with local changes across a file rename
 
-# update with local changes across a file rename
-hg init a
-cd a
-echo a > a
-hg add a
-hg ci -m a
-hg mv a b
-hg ci -m rename
-echo b > b
-hg ci -m change
-hg up -q 0
-echo c > a
-hg up
-cd ..
+  $ hg init
+
+  $ echo a > a
+  $ hg add a
+  $ hg ci -m a
+
+  $ hg mv a b
+  $ hg ci -m rename
+
+  $ echo b > b
+  $ hg ci -m change
+
+  $ hg up -q 0
+
+  $ echo c > a
+
+  $ hg up
+  merging a and b to b
+  warning: conflicts during merge.
+  merging b failed!
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+
+  $ cd ..
+