[PATCH] tests: unify test-issue660

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1283597897 -7200
# Node ID 9b3478f5ff23342d92649a37616c8f49727fc71c
# Parent  ced23cfdc82a6d6c5ea8a8c5547dd61cb7011ffc
tests: unify test-issue660

diff --git a/tests/test-issue660.out b/tests/test-issue660.out
deleted file mode 100644
--- a/tests/test-issue660.out
+++ /dev/null
@@ -1,49 +0,0 @@
-adding a
-adding b/b
-% file replaced with directory
-% should fail - would corrupt dirstate
-abort: file 'a' in dirstate clashes with 'a/a'
-% removing shadow
-% should succeed - shadow removed
-% directory replaced with file
-% should fail - would corrupt dirstate
-abort: directory 'b' already in dirstate
-% removing shadow
-% should succeed - shadow removed
-% look what we got
-A a/a
-A b
-R a
-R b/b
-% revert reintroducing shadow - should fail
-abort: file 'b' in dirstate clashes with 'b/b'
-% revert all - should succeed
-undeleting a
-forgetting a/a
-forgetting b
-undeleting b/b
-% addremove
-removing a
-adding a/a
-adding b
-removing b/b
-A a/a
-A b
-R a
-R b/b
-% commit
-C a/a
-C b
-% long directory replaced with file
-adding d/d/d
-% should fail - would corrupt dirstate
-abort: directory 'd' already in dirstate
-% removing shadow
-% should succeed - shadow removed
-% update should work at least with clean workdir
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-C a
-C b/b
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-C a/a
-C b
diff --git a/tests/test-issue660 b/tests/test-issue660.t
old mode 100755
new mode 100644
rename from tests/test-issue660
rename to tests/test-issue660.t
--- a/tests/test-issue660
+++ b/tests/test-issue660.t
@@ -1,94 +1,140 @@
-#!/bin/sh
 # http://mercurial.selenic.com/bts/issue660
 
+  $ hg init
+  $ echo a > a
+  $ mkdir b
+  $ echo b > b/b
+  $ hg commit -A -m "a is file, b is dir"
+  adding a
+  adding b/b
 
-hg init a
-cd a
-echo a > a
-mkdir b
-echo b > b/b
-hg commit -A -m "a is file, b is dir"
+File replaced with directory:
 
-echo % file replaced with directory
+  $ rm a
+  $ mkdir a
+  $ echo a > a/a
 
-rm a
-mkdir a
-echo a > a/a
+Should fail - would corrupt dirstate:
 
-echo % should fail - would corrupt dirstate
-hg add a/a
+  $ hg add a/a
+  abort: file 'a' in dirstate clashes with 'a/a'
 
-echo % removing shadow
-hg rm --after a
+Removing shadow:
 
-echo % should succeed - shadow removed
-hg add a/a
+  $ hg rm --after a
 
-echo % directory replaced with file
+Should succeed - shadow removed:
 
-rm -r b
-echo b > b
+  $ hg add a/a
 
-echo % should fail - would corrupt dirstate
-hg add b
+Directory replaced with file:
 
-echo % removing shadow
-hg rm --after b/b
+  $ rm -r b
+  $ echo b > b
 
-echo % should succeed - shadow removed
-hg add b
+Should fail - would corrupt dirstate:
 
-echo % look what we got
-hg st
+  $ hg add b
+  abort: directory 'b' already in dirstate
 
-echo % revert reintroducing shadow - should fail
-rm -r a b
-hg revert b/b
+Removing shadow:
 
-echo % revert all - should succeed
-hg revert --all
-hg st
+  $ hg rm --after b/b
 
-echo % addremove
+Should succeed - shadow removed:
 
-rm -r a b
-mkdir a
-echo a > a/a
-echo b > b
+  $ hg add b
 
-hg addremove -s 0
-hg st
+Look what we got:
 
-echo % commit
-hg ci -A -m "a is dir, b is file"
-hg st --all
+  $ hg st
+  A a/a
+  A b
+  R a
+  R b/b
 
-echo % long directory replaced with file
+Revert reintroducing shadow - should fail:
 
-mkdir d
-mkdir d/d
-echo d > d/d/d
-hg commit -A -m "d is long directory"
-rm -r d
-echo d > d
+  $ rm -r a b
+  $ hg revert b/b
+  abort: file 'b' in dirstate clashes with 'b/b'
 
-echo % should fail - would corrupt dirstate
-hg add d
+Revert all - should succeed:
 
-echo % removing shadow
-hg rm --after d/d/d
+  $ hg revert --all
+  undeleting a
+  forgetting a/a
+  forgetting b
+  undeleting b/b
 
-echo % should succeed - shadow removed
-hg add d
-hg ci -md
+  $ hg st
 
-echo % update should work at least with clean workdir
+addremove:
 
-rm -r a b d
-hg up -r 0
-hg st --all
-rm -r a b
-hg up -r 1
-hg st --all
+  $ rm -r a b
+  $ mkdir a
+  $ echo a > a/a
+  $ echo b > b
 
-exit 0
+  $ hg addremove -s 0
+  removing a
+  adding a/a
+  adding b
+  removing b/b
+
+  $ hg st
+  A a/a
+  A b
+  R a
+  R b/b
+
+commit:
+
+  $ hg ci -A -m "a is dir, b is file"
+  $ hg st --all
+  C a/a
+  C b
+
+Long directory replaced with file:
+
+  $ mkdir d
+  $ mkdir d/d
+  $ echo d > d/d/d
+  $ hg commit -A -m "d is long directory"
+  adding d/d/d
+
+  $ rm -r d
+  $ echo d > d
+
+Should fail - would corrupt dirstate:
+
+  $ hg add d
+  abort: directory 'd' already in dirstate
+
+Removing shadow:
+
+  $ hg rm --after d/d/d
+
+Should succeed - shadow removed:
+
+  $ hg add d
+  $ hg ci -md
+
+Update should work at least with clean working directory:
+
+  $ rm -r a b d
+  $ hg up -r 0
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+  $ hg st --all
+  C a
+  C b/b
+
+  $ rm -r a b
+  $ hg up -r 1
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+  $ hg st --all
+  C a/a
+  C b
+