--- a/tests/test-bookmarks-current	Sat Aug 14 02:57:54 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-echo "[extensions]" >> $HGRCPATH
-echo "bookmarks=" >> $HGRCPATH
-
-echo "[bookmarks]" >> $HGRCPATH
-echo "track.current = True" >> $HGRCPATH
-
-hg init
-
-echo % no bookmarks
-hg bookmarks
-
-echo % set bookmark X
-hg bookmark X
-
-echo % list bookmarks
-hg bookmark
-
-echo % list bookmarks with color
-hg --config extensions.color= --config color.mode=ansi \
-    bookmark --color=always
-
-echo % update to bookmark X
-hg update X
-
-echo % list bookmarks
-hg bookmarks
-
-echo % rename
-hg bookmark -m X Z
-
-echo % list bookmarks
-hg bookmarks
-
-echo % new bookmark Y
-hg bookmark Y
-
-echo % list bookmarks
-hg bookmark
-
-echo % commit
-echo 'b' > b
-hg add b
-hg commit -m'test'
-
-echo % list bookmarks
-hg bookmark
-
-echo % delete bookmarks
-hg bookmark -d Y
-hg bookmark -d Z
-
-echo % list bookmarks
-hg bookmark
-
-echo % update to tip
-hg update tip
-
-echo % set bookmark Y using -r .
-hg bookmark -r . Y
-
-echo % list bookmarks
-hg bookmark

--- a/tests/test-bookmarks-current.out	Sat Aug 14 02:57:54 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-% no bookmarks
-no bookmarks set
-% set bookmark X
-% list bookmarks
- * X                         -1:000000000000
-% list bookmarks with color
- * X                         -1:000000000000
-% update to bookmark X
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% list bookmarks
- * X                         -1:000000000000
-% rename
-% list bookmarks
- * Z                         -1:000000000000
-% new bookmark Y
-% list bookmarks
- * Y                         -1:000000000000
-   Z                         -1:000000000000
-% commit
-% list bookmarks
- * Y                         0:719295282060
-   Z                         -1:000000000000
-% delete bookmarks
-% list bookmarks
-no bookmarks set
-% update to tip
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% set bookmark Y using -r .
-% list bookmarks
- * Y                         0:719295282060

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-bookmarks-current.t	Sat Aug 14 02:58:34 2010 +0200
@@ -0,0 +1,92 @@
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "bookmarks=" >> $HGRCPATH
+
+  $ echo "[bookmarks]" >> $HGRCPATH
+  $ echo "track.current = True" >> $HGRCPATH
+
+  $ hg init
+
+no bookmarks
+
+  $ hg bookmarks
+  no bookmarks set
+
+set bookmark X
+
+  $ hg bookmark X
+
+list bookmarks
+
+  $ hg bookmark
+   * X                         -1:000000000000
+
+list bookmarks with color
+
+  $ hg --config extensions.color= --config color.mode=ansi \
+  >     bookmark --color=always
+   * X                         -1:000000000000
+
+update to bookmark X
+
+  $ hg update X
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+list bookmarks
+
+  $ hg bookmarks
+   * X                         -1:000000000000
+
+rename
+
+  $ hg bookmark -m X Z
+
+list bookmarks
+
+  $ hg bookmarks
+   * Z                         -1:000000000000
+
+new bookmark Y
+
+  $ hg bookmark Y
+
+list bookmarks
+
+  $ hg bookmark
+   * Y                         -1:000000000000
+     Z                         -1:000000000000
+
+commit
+
+  $ echo 'b' > b
+  $ hg add b
+  $ hg commit -m'test'
+
+list bookmarks
+
+  $ hg bookmark
+   * Y                         0:719295282060
+     Z                         -1:000000000000
+
+delete bookmarks
+
+  $ hg bookmark -d Y
+  $ hg bookmark -d Z
+
+list bookmarks
+
+  $ hg bookmark
+  no bookmarks set
+
+update to tip
+
+  $ hg update tip
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+set bookmark Y using -r .
+
+  $ hg bookmark -r . Y
+
+list bookmarks
+
+  $ hg bookmark
+   * Y                         0:719295282060