# 
# patch "ChangeLog"
#  from [937199b956cf78d6a0d50855cec7d32e8cec97ed]
#    to [da9b600f041b29174e3f29bb17779c9f16d20254]
# 
# patch "tests/t_cvsimport_drepper2.at"
#  from [fde4deef78413149b2e5d5ade16ba1f3488d8fa7]
#    to [c0d315c7c6fd5077592b8d81ecbc8a801acc3e41]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-07-01  Matthew Gregan  <address@hidden>
+
+	* tests/t_cvsimport_drepper2.at: Canonicalise monotone output so
+	that the test passes on Win32.
+
 2005-06-30  Patrick Mauritz  <address@hidden>
 
 	* automate.cc, basic_io.hh, cert.cc, change_set.cc,
--- tests/t_cvsimport_drepper2.at
+++ tests/t_cvsimport_drepper2.at
@@ -67,8 +67,10 @@
 AT_CHECK(MONOTONE --branch=foo.bar cvs_import e, [], [ignore], [ignore])
 AT_CHECK(MONOTONE --branch=foo.bar co)
 AT_CHECK(cd foo.bar && MONOTONE cat manifest, [], [stdout])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(cmp test.manifest stdout)
 AT_CHECK(cd foo.bar && MONOTONE list tags, [], [stdout])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(cmp test.tags stdout)
 
 AT_CLEANUP