[PATCH] tests: unify test-issue842

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1283618902 -7200
# Node ID d987dfaca09878d947c50a44f843feed8755fd4e
# Parent  242191e38b9ebba7f100b8650c5efb79e56cf2d5
tests: unify test-issue842

diff --git a/tests/test-issue842.out b/tests/test-issue842.out
deleted file mode 100644
--- a/tests/test-issue842.out
+++ /dev/null
@@ -1,10 +0,0 @@
-adding a
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-% should issue warning
-adding a
-created new head
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-% should not issue warning
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-marked working directory as branch testing
-% should not issue warning
diff --git a/tests/test-issue842 b/tests/test-issue842.t
old mode 100755
new mode 100644
rename from tests/test-issue842
rename to tests/test-issue842.t
--- a/tests/test-issue842
+++ b/tests/test-issue842.t
@@ -1,22 +1,38 @@
-#!/bin/sh
+# http://mercurial.selenic.com/bts/issue842
 
-hg init test
-cd test
-echo foo > a
-hg ci -Ama
+  $ hg init
+  $ echo foo > a
+  $ hg ci -Ama
+  adding a
 
-hg up -r0000
-echo bar > a
-echo % should issue warning
-hg ci -Amb
+  $ hg up -r0000
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
-hg up -r0000
-echo stuffy > a
-echo % should not issue warning
-hg ci -q -Amc
+  $ echo bar > a
 
-hg up -r0000
-echo crap > a
-hg branch testing
-echo % should not issue warning
-hg ci -q -Amd
+Should issue new head warning:
+
+  $ hg ci -Amb
+  adding a
+  created new head
+
+  $ hg up -r0000
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
+  $ echo stuffy > a
+
+Should not issue new head warning:
+
+  $ hg ci -q -Amc
+
+  $ hg up -r0000
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
+  $ echo crap > a
+  $ hg branch testing
+  marked working directory as branch testing
+
+Should not issue warning:
+
+  $ hg ci -q -Amd
+