# 
# patch "ChangeLog"
#  from [eb658f98166488e70a7f77d3b8083dbd1e80b561]
#    to [5c0c9fe8909055bc07f4ebf6303bcfed3272c1b4]
# 
# patch "tests/t_automate_certs.at"
#  from [262e5a98e330efa8c3b4dfe705a42b579337ce44]
#    to [b750df1376ac9d54effb29ecef821f329222e8bb]
# 
# patch "tests/t_epoch_server.at"
#  from [ed3df6e17c8510e91e8440a581c766c85ee4c8f2]
#    to [cf758cee3e08a84d727df1b43815cc30737d4190]
# 
# patch "tests/t_selector_later_earlier.at"
#  from [126ad78666f5b4f1d281caf4726da7d5d021fee4]
#    to [8e3a1438e23b7c4b562d254c55c2f2d4b0a75bd5]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,10 @@
+2005-05-29  Nathaniel Smith  <address@hidden>
+
+	* tests/t_epoch.at: Typo.
+	* tests/t_automate_certs.at, tests/t_selector_later_earlier.at:
+	Throw in some calls to CANONICALISE, maybe this will help on
+	Win32...
+
 2005-05-28  Joel Reed  <address@hidden>
 
 	* app_state.cc, app_state.hh, commands.cc, monotone.cc, options.h:
--- tests/t_automate_certs.at
+++ tests/t_automate_certs.at
@@ -38,17 +38,20 @@
 
 # check that a correct usage produces correctly formatted output
 AT_CHECK(MONOTONE automate certs $BASE_R, [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(cmp expected stdout)
 
 # ensure that missing revisions fail
 NOSUCHREV=0000000000000000000000000000000000000000
 AT_CHECK(MONOTONE automate certs $NOSUCHREV, [1], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(cmp empty stdout)
 
 # ensure that revisions are not being completed
 # (the above commit will have created rev 306c506078df4b58470f75c845ccd11c2ea8cb26)
 TRUNCATEDREV=306c506078df4b58470f75c845ccd1
 AT_CHECK(MONOTONE automate certs $TRUNCATEDREV, [1], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(cmp empty stdout)
 
 AT_CLEANUP
--- tests/t_epoch_server.at
+++ tests/t_epoch_server.at
@@ -1,4 +1,4 @@
-AT_SETUP([server aborbs and checks epochs])
+AT_SETUP([server absorbs and checks epochs])
 AT_KEYWORDS([netsync])
 MONOTONE_SETUP
 NETSYNC_SETUP
--- tests/t_selector_later_earlier.at
+++ tests/t_selector_later_earlier.at
@@ -6,6 +6,7 @@
 AT_CHECK(cp testfile testfile1)
 AT_CHECK(MONOTONE commit --date="2005-03-11T20:33:01" --branch=foo --message=march, [], [ignore], [ignore])
 AT_CHECK(echo "`BASE_REVISION`" , [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout first)
 
 AT_DATA(testfile, [Now, this is a different file
@@ -13,6 +14,7 @@
 AT_CHECK(cp testfile testfile2)
 AT_CHECK(MONOTONE commit --date="2005-04-22T12:15:00" --branch=foo --message=aprila, [], [ignore], [ignore])
 AT_CHECK(echo "`BASE_REVISION`" , [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout second)
 
 AT_DATA(testfile, [And we change it a third time
@@ -20,6 +22,7 @@
 AT_CHECK(cp testfile testfile3)
 AT_CHECK(MONOTONE commit --date="2005-04-24T07:44:39" --branch=foo --message=aprilb, [], [ignore], [ignore])
 AT_CHECK(echo "`BASE_REVISION`" , [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout third)
 
 # -------------------
@@ -28,26 +31,27 @@
 
 # this time is just 'before' the first commit, thus no output should come
 AT_CHECK(RAW_MONOTONE automate select "e:2005-03-11T20:33:00", [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout nosel)
 AT_CHECK(test -f nosel -a ! -s nosel)
 
 # these sels should extract only the first commit
 # Note: the second sel is the exact time of the first commit. 
 AT_CHECK(cp -f first expout)
-AT_CHECK(RAW_MONOTONE automate select "e:2005-04", [], [expout], [ignore])
-AT_CHECK(RAW_MONOTONE automate select "e:2005-03-11T20:33:01", [], [expout], [ignore])
-AT_CHECK(RAW_MONOTONE automate select "e:2005-03-11T20:33:02", [], [expout], [ignore])
+CHECK_SAME_CANONICALISED_STDOUT(cat first, RAW_MONOTONE automate select "e:2005-04")
+CHECK_SAME_CANONICALISED_STDOUT(cat first, RAW_MONOTONE automate select "e:2005-03-11T20:33:01")
+CHECK_SAME_CANONICALISED_STDOUT(cat first, RAW_MONOTONE automate select "e:2005-03-11T20:33:02")
 
 # now the first two
-AT_CHECK(cat second first , [], [stdout], [ignore])
-AT_CHECK(mv stdout expout)
-AT_CHECK(RAW_MONOTONE automate select "e:2005-04-23", [], [expout], [ignore])
+CHECK_SAME_CANONICALISED_STDOUT(cat second first, RAW_MONOTONE automate select "e:2005-04-23")
 
 # finally, all the files
 AT_CHECK(RAW_MONOTONE automate select "e:2005-04-30", [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout a_s)
 AT_CHECK(test 3 -eq "`wc -l <a_s`")
 AT_CHECK(RAW_MONOTONE automate select "e:2006-07", [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout a_s)
 AT_CHECK(test 3 -eq "`wc -l <a_s`")
 
@@ -97,6 +101,7 @@
 # non overlapping intervals should not match, even if the single selector 
 # will 
 AT_CHECK(RAW_MONOTONE automate select "l:2005-04-22/e:2005-04-21", [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout nosel)
 AT_CHECK(test -f nosel -a ! -s nosel)