# 
# patch "ChangeLog"
#  from [12d4c2d6c79e592dd5cf5451ae2e94b0cc16bdc8]
#    to [5da941da6bfd867172b0e422856b598f66c88ae3]
# 
# patch "tests/t_diff_external.at"
#  from [5ad9689e0dc5cb71f3cddb1a30c151a89be71d02]
#    to [d05dbe56b40eadaac3018fec89ffda8640f59f23]
# 
===============================================
--- ChangeLog	12d4c2d6c79e592dd5cf5451ae2e94b0cc16bdc8
+++ ChangeLog	5da941da6bfd867172b0e422856b598f66c88ae3
@@ -1,3 +1,7 @@
+2005-07-19  Matthew Gregan  <address@hidden>
+
+	* tests/t_diff_external.at: Canonicalise output for Win32.
+
 2005-07-18  Nathaniel Smith  <address@hidden>
 
 	* keys.cc (get_passphrase): Do still error out if they keep typing
===============================================
--- tests/t_diff_external.at	5ad9689e0dc5cb71f3cddb1a30c151a89be71d02
+++ tests/t_diff_external.at	d05dbe56b40eadaac3018fec89ffda8640f59f23
@@ -30,6 +30,9 @@
 ])
 
 AT_CHECK(MONOTONE --rcfile=testhook.lua diff --external, [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
+AT_CHECK(CANONICALISE(old_version))
+AT_CHECK(CANONICALISE(new_version))
 AT_CHECK(grep -q 'file_path: testfile' stdout)
 AT_CHECK(cmp old_version old_testfile)
 AT_CHECK(cmp new_version testfile)
@@ -38,6 +41,9 @@
 AT_CHECK(grep -q "rev_new: $NEW_SHA" stdout)
 
 AT_CHECK(MONOTONE --rcfile=testhook.lua diff --external --diff-args="-foobar", [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
+AT_CHECK(CANONICALISE(old_version))
+AT_CHECK(CANONICALISE(new_version))
 AT_CHECK(grep -q 'file_path: testfile' stdout)
 AT_CHECK(cmp old_version old_testfile)
 AT_CHECK(cmp new_version testfile)
@@ -46,6 +52,9 @@
 AT_CHECK(grep -q "rev_new: $NEW_SHA" stdout)
 
 AT_CHECK(MONOTONE --rcfile=testhook.lua diff --external --diff-args="", [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
+AT_CHECK(CANONICALISE(old_version))
+AT_CHECK(CANONICALISE(new_version))
 AT_CHECK(grep -q 'file_path: testfile' stdout)
 AT_CHECK(cmp old_version old_testfile)
 AT_CHECK(cmp new_version testfile)