# 
# patch "ChangeLog"
#  from [e39f1771c98c4baf2aebff35c0c9db8aa520a85b]
#    to [41bd823633cd37632b29ced653ab1388f65922bc]
# 
# patch "tests/t_netsync_largish_file.at"
#  from [0b5e0097e6e6e776b27d24fbe112ca786f27a455]
#    to [832ace2e71cec590ff7a998066d50f3a097a78c4]
# 
# patch "tests/t_setup_checkout_modify_new_dir.at"
#  from [d3861a3bdaf6b55792cb14000ab5e79f6b00d82b]
#    to [6eda0e1493305bf3bfa55d94dc4eaddb5c9e0d49]
# 
# patch "tests/t_sticky_branch.at"
#  from [e07f23c47b810968535f7282238be910907a07eb]
#    to [7ad4b1f57c40c5f82854acb9f4d275fe9744144c]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,11 @@
+2005-04-20  Jon Bright  <address@hidden>
+	* tests/t_sticky_branch.at: Canonicalise stdout before comparison
+	* tests/t_setup_checkout_modify_new_dir.at: Ditto
+	* tests/t_netsync_largish_file.at: Check the file out rather
+	than catting it, then canonicalisation is unneeded.  
+	Canonicalisation is bad here, because the file is random
+	binary data, not text with line-ending conventions
+
 2005-04-19  Richard Levitte  <address@hidden>
 
 	* testsuite.at (REVERT_TO): Make it possible to revert to a
--- tests/t_netsync_largish_file.at
+++ tests/t_netsync_largish_file.at
@@ -26,9 +26,8 @@
 
 NETSYNC_SERVE_STOP
 
-AT_CHECK(MONOTONE --db=test2.db cat file $F_VER0, [], [stdout])
-AT_CHECK(CANONICALISE(stdout))
-CHK=`SHA1(stdout)`
+AT_CHECK(MONOTONE --db=test2.db --branch=testbranch checkout other, [], [ignore], [ignore])
+CHK=`SHA1(other/largish)`
 AT_CHECK(test $CHK = $F_VER0)
 
 AT_CLEANUP
--- tests/t_setup_checkout_modify_new_dir.at
+++ tests/t_setup_checkout_modify_new_dir.at
@@ -12,7 +12,10 @@
 SET_FILE(foo, [stuff stuff
 ])
 AT_CHECK(MONOTONE commit --message=foo, [], [ignore], [ignore])
-CHECK_SAME_STDOUT(BASE_REVISION, MONOTONE automate heads testbranch)
+AT_CHECK(MONOTONE automate heads testbranch, [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
+AT_CHECK(mv stdout headsout)
+CHECK_SAME_STDOUT(BASE_REVISION, cat headsout)
 
 # now create a revision in otherbranch...
 AT_DATA(setupdir/blah, [yum yum
@@ -25,6 +28,9 @@
 SET_FILE(foo, [more more
 ])
 AT_CHECK(MONOTONE commit --message=foo, [], [ignore], [ignore])
-CHECK_SAME_STDOUT(BASE_REVISION, MONOTONE automate heads testbranch)
+AT_CHECK(MONOTONE automate heads testbranch, [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
+AT_CHECK(mv stdout headsout)
+CHECK_SAME_STDOUT(BASE_REVISION, cat headsout)
 
 AT_CLEANUP
--- tests/t_sticky_branch.at
+++ tests/t_sticky_branch.at
@@ -62,6 +62,7 @@
 AT_CHECK(cd codir && MONOTONE commit --message=foo, [], [ignore], [ignore])
 # we check that this didn't create a new head of branch third
 AT_CHECK(MONOTONE automate heads third, [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(cmp stdout old-third-heads)
 
 AT_CLEANUP