--- a/tests/test-mactext	Thu Apr 03 20:41:31 2008 +0900
+++ b/tests/test-mactext	Sat Apr 05 19:03:45 2008 +0200
@@ -28,88 +28,5 @@
 
 python unix2mac.py f
 hg ci -m 2 -d'0 0'
-hg revert -a
-echo
-
-mkdir d
-echo hello > d/f2
-python unix2mac.py d/f2
-hg add d/f2
-hg ci -m 3 -d'0 0'
-hg revert -a
-rm d/f2
-echo
-
-hg rem f
-hg ci -m 4 -d'0 0'
-echo
-
-python -c 'file("bin", "wb").write("hello\x00\x0D")'
-hg add bin
-hg ci -m 5 -d'0 0'
-hg log -v
-echo
-
-hg clone . dupe
-echo
-for x in a b c d; do echo content > dupe/$x; done
-hg -R dupe add
-python unix2mac.py dupe/b dupe/c dupe/d
-hg -R dupe ci -m a -d'0 0' dupe/a
-hg -R dupe ci -m b/c -d'0 0' dupe/[bc]
-hg -R dupe ci -m d -d'0 0' dupe/d
-hg -R dupe log -v
-echo
-
-hg pull dupe
-echo
-
-hg log -v
-echo
-
-rm .hg/hgrc
-(echo some; echo text) > f3
-python -c 'file("f4.bat", "wb").write("rem empty\x0D")'
-hg add f3 f4.bat
-hg ci -m 6 -d'0 0'
-
-python print.py < bin
-python print.py < f3
-python print.py < f4.bat
-echo
-
-echo '[extensions]' >> .hg/hgrc
-echo 'win32text = ' >> .hg/hgrc
-echo '[decode]' >> .hg/hgrc
-echo '** = macdecode:' >> .hg/hgrc
-echo '[encode]' >> .hg/hgrc
-echo '** = macencode:' >> .hg/hgrc
-cat .hg/hgrc
-echo
-
-rm f3 f4.bat bin
-hg co 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))'
-python print.py < bin
-python print.py < f3
-python print.py < f4.bat
-echo
-
-python -c 'file("f5.sh", "wb").write("# empty\x0D")'
-hg add f5.sh
-hg ci -m 7 -d'0 0'
-python print.py < f5.sh
-hg cat f5.sh | python print.py
-
-echo '% just linefeed' > linefeed
-hg ci -qAm 8 linefeed
-python print.py < linefeed
-hg cat linefeed | python print.py
-hg st -q
-hg revert -a linefeed
-python print.py < linefeed
-hg st -q
-echo modified >> linefeed
-hg st -q
-hg revert -a
-hg st -q
-python print.py < linefeed
+hg cat f | python print.py
+cat f | python print.py

--- a/tests/test-mactext.out	Thu Apr 03 20:41:31 2008 +0900
+++ b/tests/test-mactext.out	Sat Apr 05 19:03:45 2008 +0200
@@ -8,180 +8,5 @@
 transaction abort!
 rollback completed
 abort: pretxncommit.cr hook failed
-reverting f
-
-Attempt to commit or push text file(s) using CR line endings
-in 8aa1d87b4e2f: d/f2
-transaction abort!
-rollback completed
-abort: pretxncommit.cr hook failed
-forgetting d/f2
-
-
-changeset:   2:d7599e43717c
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       bin
-description:
-5
-
-
-changeset:   1:c72a7d1d0907
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       f
-description:
-4
-
-
-changeset:   0:fcf06d5c4e1d
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       f
-description:
-1
-
-
-
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-adding dupe/a
-adding dupe/b
-adding dupe/c
-adding dupe/d
-changeset:   5:ebbcbe52b20e
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       d
-description:
-d
-
-
-changeset:   4:ceeb93d6508a
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       b c
-description:
-b/c
-
-
-changeset:   3:c5404edbb872
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       a
-description:
-a
-
-
-changeset:   2:d7599e43717c
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       bin
-description:
-5
-
-
-changeset:   1:c72a7d1d0907
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       f
-description:
-4
-
-
-changeset:   0:fcf06d5c4e1d
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       f
-description:
-1
-
-
-
-pulling from dupe
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 4 changes to 4 files
-Attempt to commit or push text file(s) using CR line endings
-in ceeb93d6508a: b
-in ceeb93d6508a: c
-in ebbcbe52b20e: d
-
-To prevent this mistake in your local repository,
-add to Mercurial.ini or .hg/hgrc:
-
-[hooks]
-pretxncommit.cr = python:hgext.win32text.forbidcr
-
-and also consider adding:
-
-[extensions]
-hgext.win32text =
-[encode]
-** = macencode:
-[decode]
-** = macdecode:
-transaction abort!
-rollback completed
-abort: pretxnchangegroup.cr hook failed
-
-changeset:   2:d7599e43717c
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       bin
-description:
-5
-
-
-changeset:   1:c72a7d1d0907
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       f
-description:
-4
-
-
-changeset:   0:fcf06d5c4e1d
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       f
-description:
-1
-
-
-
-hello<NUL><CR>
-some<LF>text<LF>
-rem empty<CR>
-
-[extensions]
-win32text = 
-[decode]
-** = macdecode:
-[encode]
-** = macencode:
-
-WARNING: f4.bat already has CR line endings
-and does not need EOL conversion by the win32text plugin.
-Before your next commit, please reconsider your encode/decode settings in 
-Mercurial.ini or ..../.hg/hgrc.
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-hello<NUL><CR>
-some<CR>text<CR>
-rem empty<CR>
-
-# empty<CR>
-# empty<LF>
-% just linefeed<LF>
-% just linefeed<LF>
-no changes needed to linefeed
-% just linefeed<LF>
-M linefeed
-reverting linefeed
-% just linefeed<CR>
+hello<LF>
+hello<CR>