# 
# 
# patch "ChangeLog"
#  from [673dfb7df15012a25244211cf8a7a842505fc5b2]
#    to [38c4fa689ae077fd913a7ce1860a83af4f997024]
# 
# patch "tests/diff_output_formats/__driver__.lua"
#  from [6dbcdb090b2cd79c16c3aa84a6717da390e5614b]
#    to [dd30df15f21fd1f41db872024942cc75938ac7eb]
# 
============================================================
--- ChangeLog	673dfb7df15012a25244211cf8a7a842505fc5b2
+++ ChangeLog	38c4fa689ae077fd913a7ce1860a83af4f997024
@@ -1,3 +1,7 @@
+2006-07-12  Timothy Brownawell  <address@hidden>
+
+	* tests/diff_output_formats/__driver__.lua: Needs canonicalization.
+
 2006-07-11  Richard Levitte  <address@hidden>
 
 	* po/sv.po: Two new strings to translate.
============================================================
--- tests/diff_output_formats/__driver__.lua	6dbcdb090b2cd79c16c3aa84a6717da390e5614b
+++ tests/diff_output_formats/__driver__.lua	dd30df15f21fd1f41db872024942cc75938ac7eb
@@ -17,12 +17,21 @@
    src = sha1(src)
    dst = sha1(dst)
 
-   check(mtn("fdiff", base, base, src, dst), 0, {ud}, nil, nil)
-   check(mtn("fdiff", "--context", base, base, src, dst), 0, {cd}, nil, nil)
+   check(mtn("fdiff", base, base, src, dst), 0, true, nil, nil)
+   canonicalize("stdout")
+   check(samefile("stdout", ud))
+   check(mtn("fdiff", "--context", base, base, src, dst),
+         0, true, nil, nil)
+   canonicalize("stdout")
+   check(samefile("stdout", cd))
    check(mtn("fdiff", "--show-encloser", base, base, src, dst), 
-	 0, {udp}, nil, nil)
+	 0, true, nil, nil)
+   canonicalize("stdout")
+   check(samefile("stdout", udp))
    check(mtn("fdiff", "--context", "--show-encloser", base, base, src, dst),
-	 0, {cdp}, nil, nil)
+	 0, true, nil, nil)
+   canonicalize("stdout")
+   check(samefile("stdout", cdp))
 end
 
 append("test_hooks.lua",