# 
# patch "ChangeLog"
#  from [d6c7e687c8c935dc413786d37d97d18b0f2d6597]
#    to [a149e511d07cc3022b06bf45673340b48f1b0c05]
# 
# patch "tests/t_log_brief.at"
#  from [41e612ccf6a0320c64b89a7cf39996d466b3f07c]
#    to [659ab85957e702aba713117d071bea86bd74aebf]
# 
# patch "testsuite.at"
#  from [9843a5c53ec471614fc6d5ef5dfcf16fc6995608]
#    to [2696934aa2e3d275fcfea83f97e45d1fe833f3bd]
# 
========================================================================
--- ChangeLog	d6c7e687c8c935dc413786d37d97d18b0f2d6597
+++ ChangeLog	a149e511d07cc3022b06bf45673340b48f1b0c05
@@ -1,3 +1,10 @@
+2005-09-18  Matthew Gregan  <address@hidden>
+
+	* testsuite.at: Tweak default 'eveything' netsync glob to
+	something that works around the MinGW/Win32 globbing issues for
+	now.
+	* tests/t_log_brief.at: Canonicalise output on Win32.
+
 2005-09-17  Timothy Brownawell  <address@hidden>
 
 	* contrib/usher.cc: Remove stray "new int[2];' statements from
========================================================================
--- tests/t_log_brief.at	41e612ccf6a0320c64b89a7cf39996d466b3f07c
+++ tests/t_log_brief.at	659ab85957e702aba713117d071bea86bd74aebf
@@ -20,6 +20,8 @@
 AT_CHECK(echo "$R2 address@hidden 2005-08-16T03:16:05 otherbranch" > target)
 AT_CHECK(echo "$R1 address@hidden 2005-08-16T03:16:00 testbranch" >> target)
 AT_CHECK(echo "$R0 address@hidden 2005-08-16T03:16:00 testbranch" >> target)
+AT_CHECK(CANONICALISE(stdout))
+AT_CHECK(CANONICALISE(target))
 AT_CHECK(cmp stdout target)
 
 AT_CLEANUP
========================================================================
--- testsuite.at	9843a5c53ec471614fc6d5ef5dfcf16fc6995608
+++ testsuite.at	2696934aa2e3d275fcfea83f97e45d1fe833f3bd
@@ -385,13 +385,13 @@
 # note that NETSYNC_SERVE_START is _not_ a special case of this macro.
 m4_define([NETSYNC_SERVE_N_START], [
 NETSYNC_KILLHARD
-MONOTONE --db=test$1.db --rcfile=netsync.lua --pid-file=monotone_at.pid serve NETSYNC_ADDRESS m4_if($2, [], "*", $2) &
+MONOTONE --db=test$1.db --rcfile=netsync.lua --pid-file=monotone_at.pid serve NETSYNC_ADDRESS m4_if($2, [], "{}*", $2) &
 sleep 4
 ])
 # run as NETSYNC_SERVE_START(pattern)
 m4_define([NETSYNC_SERVE_START], [
 NETSYNC_KILLHARD
-MONOTONE --rcfile=netsync.lua --pid-file=monotone_at.pid serve NETSYNC_ADDRESS m4_if($1, [], "*", $1) &
+MONOTONE --rcfile=netsync.lua --pid-file=monotone_at.pid serve NETSYNC_ADDRESS m4_if($1, [], "{}*", $1) &
 sleep 4
 ])
 # run as NETSYNC_SERVE_STOP