summaryrefslogtreecommitdiff
path: root/tests/test-encoding.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-encoding.t')
-rw-r--r--tests/test-encoding.t7
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/test-encoding.t b/tests/test-encoding.t
index ee884ba..e691a03 100644
--- a/tests/test-encoding.t
+++ b/tests/test-encoding.t
@@ -5,7 +5,7 @@ Test character encoding
we need a repo with some legacy latin-1 changesets
- $ hg unbundle "$TESTDIR/bundles/legacy-encoding.hg"
+ $ hg unbundle $TESTDIR/bundles/legacy-encoding.hg
adding changesets
adding manifests
adding file changes
@@ -42,7 +42,6 @@ these should work
$ HGENCODING=latin-1 hg tag `cat latin-1-tag`
$ HGENCODING=latin-1 hg branch `cat latin-1-tag`
marked working directory as branch \xe9 (esc)
- (branches are permanent and global, did you want a bookmark?)
$ HGENCODING=latin-1 hg ci -m 'latin1 branch'
$ rm .hg/branch
@@ -235,8 +234,7 @@ hg log (utf-8)
hg log (dolphin)
$ HGENCODING=dolphin hg log
- abort: unknown encoding: dolphin
- (please check your locale settings)
+ abort: unknown encoding: dolphin, please check your locale settings
[255]
$ HGENCODING=ascii hg branch `cat latin-1-tag`
abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc)
@@ -249,4 +247,3 @@ Test roundtrip encoding of lookup tables when not using UTF-8 (issue2763)
$ HGENCODING=latin-1 hg up `cat latin-1-tag`
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ cd ..