[PATCH] tests: unify test-update-reverse

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1284455935 -7200
# Node ID 2e9c15ff2e66adb4524ba823ab7a364a3213a232
# Parent  f9e90f9e23e94605a415b51456f2da9cdfbd38bc
tests: unify test-update-reverse

diff --git a/tests/test-update-reverse.out b/tests/test-update-reverse.out
deleted file mode 100644
--- a/tests/test-update-reverse.out
+++ /dev/null
@@ -1,58 +0,0 @@
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-Main should be gone
-a
-created new head
-changeset:   3:91ebc10ed028
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     Added side2
-
-changeset:   2:b932d7dbb1e1
-parent:      0:c2eda428b523
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     Added side1
-
-changeset:   1:71a760306caf
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     Added main
-
-changeset:   0:c2eda428b523
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     Added a
-
-Should have two heads, side2 and main
-changeset:   3:91ebc10ed028
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     Added side2
-
-changeset:   1:71a760306caf
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     Added main
-
-Should show a side1 side2
-a
-side1
-side2
-resolving manifests
- overwrite True partial False
- ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf
- side2: other deleted -> r
- side1: other deleted -> r
- main: remote created -> g
-updating: side1 1/3 files (33.33%)
-removing side1
-updating: side2 2/3 files (66.67%)
-removing side2
-updating: main 3/3 files (100.00%)
-getting main
-1 files updated, 0 files merged, 2 files removed, 0 files unresolved
-Should only show a main
-a
-main
diff --git a/tests/test-update-reverse b/tests/test-update-reverse.t
old mode 100755
new mode 100644
rename from tests/test-update-reverse
rename to tests/test-update-reverse.t
--- a/tests/test-update-reverse
+++ b/tests/test-update-reverse.t
@@ -1,34 +1,85 @@
-#!/bin/sh
+  $ hg init
 
-hg init
-touch a
-hg add a
-hg commit -m "Added a"
+  $ touch a
+  $ hg add a
+  $ hg commit -m "Added a"
 
-touch main
-hg add main
-hg commit -m "Added main"
-hg checkout 0
+  $ touch main
+  $ hg add main
+  $ hg commit -m "Added main"
+  $ hg checkout 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
-echo Main should be gone
-ls
+'main' should be gone:
 
-touch side1
-hg add side1
-hg commit -m "Added side1"
-touch side2
-hg add side2
-hg commit -m "Added side2"
+  $ ls
+  a
 
-hg log
+  $ touch side1
+  $ hg add side1
+  $ hg commit -m "Added side1"
+  created new head
+  $ touch side2
+  $ hg add side2
+  $ hg commit -m "Added side2"
 
-echo Should have two heads, side2 and main
-hg heads
+  $ hg log
+  changeset:   3:91ebc10ed028
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added side2
+  
+  changeset:   2:b932d7dbb1e1
+  parent:      0:c2eda428b523
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added side1
+  
+  changeset:   1:71a760306caf
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added main
+  
+  changeset:   0:c2eda428b523
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added a
+  
 
-echo Should show "a side1 side2"
-ls
+  $ hg heads
+  changeset:   3:91ebc10ed028
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added side2
+  
+  changeset:   1:71a760306caf
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added main
+  
+  $ ls
+  a
+  side1
+  side2
 
-hg update --debug -C 1
-echo Should only show "a main"
-ls
+  $ hg update --debug -C 1
+  resolving manifests
+   overwrite True partial False
+   ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf
+   side2: other deleted -> r
+   side1: other deleted -> r
+   main: remote created -> g
+  updating: side1 1/3 files (33.33%)
+  removing side1
+  updating: side2 2/3 files (66.67%)
+  removing side2
+  updating: main 3/3 files (100.00%)
+  getting main
+  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
+  $ ls
+  a
+  main
+