--- a/tests/test-mq-symlinks Mon Aug 16 10:58:03 2010 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-"$TESTDIR/hghave" symlink || exit 80
-
-echo "[extensions]" >> $HGRCPATH
-echo "mq=" >> $HGRCPATH
-
-hg init
-hg qinit
-hg qnew base.patch
-echo aaa > a
-echo bbb > b
-echo ccc > c
-hg add a b c
-hg qrefresh
-$TESTDIR/readlink.py a
-
-echo '% test replacing a file with a symlink'
-hg qnew symlink.patch
-rm a
-ln -s b a
-hg qrefresh --git
-$TESTDIR/readlink.py a
-
-hg qpop
-hg qpush
-$TESTDIR/readlink.py a
-
-echo '% test updating a symlink'
-rm a
-ln -s c a
-hg qnew --git -f updatelink
-$TESTDIR/readlink.py a
-hg qpop
-hg qpush --debug
-$TESTDIR/readlink.py a
-hg st
-
-echo '% test replacing a symlink with a file'
-ln -s c s
-hg add s
-hg qnew --git -f addlink
-rm s
-echo sss > s
-hg qnew --git -f replacelinkwithfile
-hg qpop
-hg qpush
-cat s
-hg st
-
-echo '% test symlink removal'
-hg qnew removesl.patch
-hg rm a
-hg qrefresh --git
-hg qpop
-hg qpush
-hg st -c
--- a/tests/test-mq-symlinks.out Mon Aug 16 10:58:03 2010 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-a -> a not a symlink
-% test replacing a file with a symlink
-a -> b
-popping symlink.patch
-now at: base.patch
-applying symlink.patch
-now at: symlink.patch
-a -> b
-% test updating a symlink
-a -> c
-popping updatelink
-now at: symlink.patch
-applying updatelink
-patching file a
-a
-now at: updatelink
-a -> c
-% test replacing a symlink with a file
-popping replacelinkwithfile
-now at: addlink
-applying replacelinkwithfile
-now at: replacelinkwithfile
-sss
-% test symlink removal
-popping removesl.patch
-now at: replacelinkwithfile
-applying removesl.patch
-now at: removesl.patch
-C b
-C c
-C s
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-mq-symlinks.t Mon Aug 16 10:59:38 2010 +0900
@@ -0,0 +1,90 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
+ $ echo "[extensions]" >> $HGRCPATH
+ $ echo "mq=" >> $HGRCPATH
+
+ $ hg init
+ $ hg qinit
+ $ hg qnew base.patch
+ $ echo aaa > a
+ $ echo bbb > b
+ $ echo ccc > c
+ $ hg add a b c
+ $ hg qrefresh
+ $ $TESTDIR/readlink.py a
+ a -> a not a symlink
+
+
+test replacing a file with a symlink
+
+ $ hg qnew symlink.patch
+ $ rm a
+ $ ln -s b a
+ $ hg qrefresh --git
+ $ $TESTDIR/readlink.py a
+ a -> b
+
+ $ hg qpop
+ popping symlink.patch
+ now at: base.patch
+ $ hg qpush
+ applying symlink.patch
+ now at: symlink.patch
+ $ $TESTDIR/readlink.py a
+ a -> b
+
+
+test updating a symlink
+
+ $ rm a
+ $ ln -s c a
+ $ hg qnew --git -f updatelink
+ $ $TESTDIR/readlink.py a
+ a -> c
+ $ hg qpop
+ popping updatelink
+ now at: symlink.patch
+ $ hg qpush --debug
+ applying updatelink
+ patching file a
+ a
+ now at: updatelink
+ $ $TESTDIR/readlink.py a
+ a -> c
+ $ hg st
+
+
+test replacing a symlink with a file
+
+ $ ln -s c s
+ $ hg add s
+ $ hg qnew --git -f addlink
+ $ rm s
+ $ echo sss > s
+ $ hg qnew --git -f replacelinkwithfile
+ $ hg qpop
+ popping replacelinkwithfile
+ now at: addlink
+ $ hg qpush
+ applying replacelinkwithfile
+ now at: replacelinkwithfile
+ $ cat s
+ sss
+ $ hg st
+
+
+test symlink removal
+
+ $ hg qnew removesl.patch
+ $ hg rm a
+ $ hg qrefresh --git
+ $ hg qpop
+ popping removesl.patch
+ now at: replacelinkwithfile
+ $ hg qpush
+ applying removesl.patch
+ now at: removesl.patch
+ $ hg st -c
+ C b
+ C c
+ C s