# 
# patch "ChangeLog"
#  from [917d991b0348bf784b842a5cb7a11ad6dc2ffe68]
#    to [2cecc74ac8e7f3c06ae6ed26a2e082aae8bf2aa8]
# 
# patch "testsuite.at"
#  from [8b14ef4c159c31040f3bbe67bff8f85bf3d99e1c]
#    to [62c20553701e7f00af1169128b1fd86af4151a88]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,11 @@
 2005-07-12  Nathaniel Smith  <address@hidden>
 
+	* testsuite.at (NETSYNC_SERVE_START, NETSYNC_SERVE_N_START):
+	Really, really really fix up quoting.  Really.
+	I hope.
+
+2005-07-12  Nathaniel Smith  <address@hidden>
+
 	* contrib/ciabot_monotone.py (config.project_for_branch): Clarify
 	comment text for non-Python programmers.
 
--- testsuite.at
+++ testsuite.at
@@ -380,15 +380,13 @@
 # note that NETSYNC_SERVE_START is _not_ a special case of this macro.
 m4_define([NETSYNC_SERVE_N_START], [
 NETSYNC_KILLHARD
-_FOO="$2"
-MONOTONE --db=test$1.db --rcfile=netsync.lua --pid-file=monotone_at.pid serve localhost:$_PORT ${_FOO:-"*"} &
+MONOTONE --db=test$1.db --rcfile=netsync.lua --pid-file=monotone_at.pid serve localhost:$_PORT m4_if($2, [], "*", $2) &
 sleep 4
 ])
 # run as NETSYNC_SERVE_START(pattern)
 m4_define([NETSYNC_SERVE_START], [
 NETSYNC_KILLHARD
-_FOO="$1"
-MONOTONE --rcfile=netsync.lua --pid-file=monotone_at.pid serve localhost:$_PORT ${_FOO:-"*"} &
+MONOTONE --rcfile=netsync.lua --pid-file=monotone_at.pid serve localhost:$_PORT m4_if($1, [], "*", $1) &
 sleep 4
 ])
 # run as NETSYNC_SERVE_STOP