--- a/tests/test-encoding.out
+++ b/tests/test-encoding.out
@@ -6,22 +6,26 @@ added 1 changesets with 1 changes to 1 f
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should fail with encoding error
 M a
-abort: decoding near 'cii 0xe9: é': 'ascii' codec can't decode byte 0xe9 in position 12: ordinal not in range(128)!
+? latin-1
+? latin-1-tag
+? utf-8
+abort: decoding near ' encoded: é': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)!
 
 transaction abort!
 rollback completed
 % these should work
-changeset:   3:d6b63b86e629
+% ascii
+changeset:   3:5edfc7acb541
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     Added tag ? for changeset 20ea57f280ca
+summary:     Added tag ? for changeset 91878608adb3
 
-changeset:   2:20ea57f280ca
+changeset:   2:91878608adb3
 tag:         ?
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     utf-8 e': ?
+summary:     utf-8 e' encoded: ?
 
 changeset:   1:6355cacf842e
 user:        test
@@ -33,17 +37,18 @@ user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin-1 e': ?
 
-changeset:   3:d6b63b86e629
+% latin-1
+changeset:   3:5edfc7acb541
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     Added tag é for changeset 20ea57f280ca
+summary:     Added tag é for changeset 91878608adb3
 
-changeset:   2:20ea57f280ca
+changeset:   2:91878608adb3
 tag:         é
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     utf-8 e': é
+summary:     utf-8 e' encoded: é
 
 changeset:   1:6355cacf842e
 user:        test
@@ -55,17 +60,18 @@ user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin-1 e': é
 
-changeset:   3:d6b63b86e629
+% utf-8
+changeset:   3:5edfc7acb541
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     Added tag é for changeset 20ea57f280ca
+summary:     Added tag é for changeset 91878608adb3
 
-changeset:   2:20ea57f280ca
+changeset:   2:91878608adb3
 tag:         é
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     utf-8 e': é
+summary:     utf-8 e' encoded: é
 
 changeset:   1:6355cacf842e
 user:        test
@@ -77,9 +83,12 @@ user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     latin-1 e': é
 
-tip                                3:d6b63b86e629
-?                                  2:20ea57f280ca
-tip                                3:d6b63b86e629
-é                                  2:20ea57f280ca
-tip                                3:d6b63b86e629
-é                                  2:20ea57f280ca
+% ascii
+tip                                3:5edfc7acb541
+?                                  2:91878608adb3
+% latin-1
+tip                                3:5edfc7acb541
+é                                  2:91878608adb3
+% utf-8
+tip                                3:5edfc7acb541
+é                                  2:91878608adb3