# 
# patch "ChangeLog"
#  from [e58bdade15259de4f7dd5b5b7889172f3ec1a193]
#    to [bccdb6f2c9132e81f720841d9d912af0e826a043]
# 
# patch "tests/t_cvsimport_deleted_invar.at"
#  from [32da8b246eea20fe065e860c6b2428ffce7230ed]
#    to [4ee87dff9e284fdf7abf6ca72616c55b32f39a3d]
# 
# patch "tests/t_i18n_file.at"
#  from [a39e207b12af72749c8345dc62c15198ab12c2ff]
#    to [d2d853d11983314f03ef8703f42f3a8c95d7cde6]
# 
# patch "tests/t_merge_normalization_edge_case.at"
#  from [2c48056ce9a0a0567f4798b57b9c6828c0151bc7]
#    to [878221e1b8160bc69121f1948555364da3690262]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,10 @@
+2005-06-01  Matt Johnston  <address@hidden>
+
+	* tests/t_cvsimport_deleted_invar.at: don't use -C with tar
+	* tests/t_i18n_file.at: capitalise CHARSET=UTF-8, seems more standard.
+	* tests/t_merge_normalization_edge_case.at: use known-good output
+	rather than using diff3 --merge
+
 2005-05-31  Timothy Brownawell  <address@hidden>
 
 	* netsync.cc: session::rebuild_merkle_trees now takes a set of
--- tests/t_cvsimport_deleted_invar.at
+++ tests/t_cvsimport_deleted_invar.at
@@ -16,7 +16,7 @@
 ])
 
 UNGZB64(cvsrepo.gz.enc, cvsrepo.tar)
-AT_CHECK(tar -C $CVSROOT -xf cvsrepo.tar)
+AT_CHECK(cd $CVSROOT && tar -xf ../cvsrepo.tar)
 AT_CHECK(test -d $CVSROOT/attest)
 
 AT_CHECK(cvs -d $CVSROOT co -r1.1 attest, [], [ignore], [ignore])
--- tests/t_i18n_file.at
+++ tests/t_i18n_file.at
@@ -30,12 +30,9 @@
 AT_CHECK(MONOTONE add "weird/file name with spaces", [], [ignore], [ignore])
 AT_CHECK(MONOTONE add "weird/$FUNNY_FILENAME", [], [ignore], [ignore])
 
-export LANG=en_US.UTF-8
-export CHARSET=utf-8
-
 # add some files with UTF8 names
 export LANG=en_US.utf-8
-export CHARSET=utf-8
+export CHARSET=UTF-8
 AT_CHECK(MONOTONE add "utf8/$EUROPEAN_UTF8", [], [ignore], [ignore])
 AT_CHECK(MONOTONE add "utf8/$JAPANESE_UTF8", [], [ignore], [ignore])
 
@@ -44,7 +41,7 @@
 # check the names showed up in our manifest
 
 export LANG=en_US.UTF-8
-export CHARSET=utf-8
+export CHARSET=UTF-8
 
 AT_CHECK(MONOTONE cat manifest, [], [stdout])
 AT_CHECK(mv stdout manifest)
--- tests/t_merge_normalization_edge_case.at
+++ tests/t_merge_normalization_edge_case.at
@@ -185,9 +185,7 @@
 AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout merge.monotone, [], [ignore], [ignore])
 
-AT_CHECK(diff3 -E --merge left parent right, [], [stdout], [ignore])
-AT_CHECK(mv stdout merge.diff3, [], [ignore], [ignore])
+# in this case the output should be the same as right.
+AT_CHECK(cmp merge.monotone right, [], [ignore], [ignore])
 
-AT_CHECK(cmp merge.monotone merge.diff3, [], [ignore], [ignore])
-
 AT_CLEANUP