# 
# patch ".mt-attrs"
#  from [f9b65d9f157beb7932b20e4a85eb65487949ade9]
#    to [d916e2d789f2c0f4e92f983099b16ec904a2379b]
# 
# patch "ChangeLog"
#  from [fbcb61ee098b21068490eac6fe5aa1bcf3dad29b]
#    to [cca8fa572e36410501c7b8be9e59811146b45165]
# 
# patch "contrib/README"
#  from [6d1db875fa3a286389a8c19eee3b19bf1772a3d6]
#    to [41748f8afac99a87841c3f94004bbfc6f4295611]
# 
# patch "testsuite.at"
#  from [fb517e7363f5d1995cf3b8cfe0239c035d17ebfd]
#    to [d2d93700980437bc4d42f041d1d088c06b4e5200]
# 
--- .mt-attrs
+++ .mt-attrs
@@ -1,4 +1,4 @@
-   file "contrib/Notify.pl"
+   file "contrib/monotone-notify.pl"
 execute "true"
 
    file "contrib/ciabot_monotone.py"
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-04-16  Nathaniel Smith  <address@hidden>
 
+	* testsuite.at: Use a random server port.
+	
+	* .mt-attrs, contrib/README: Update for Notify.pl ->
+	monotone-notify.pl rename.
+	
 	* monotone.1: Warn people off rcs_import.
 	* monotone.texi (Commands): Likewise.
 
--- contrib/README
+++ contrib/README
@@ -5,8 +5,8 @@
   -- Log2Gxl.java: Java code to convert output from 'monotone log' into
      GXL, an XML-based graph description language.
 
-  -- Notify.pl: a Perl hack to create email logs with recent changes
-     in a repository database.  It's designed to be run at regular
+  -- monotone-notify.pl: a Perl hack to create email logs with recent
+     changes in a repository database.  It's designed to be run at regular
      intervals, for example from a cron script.  It uses database
      variables (those handled with 'monotone set/unset') in the domain
      domain 'notify' to keep track of the last revisions that have
--- testsuite.at
+++ testsuite.at
@@ -37,6 +37,10 @@
 # Save the PWD so MONOTONE macro can refer back to it
 _ROOT_DIR=`pwd -P`
 
+# Pick a random port, so running multiple testsuites concurrently on
+# the same machine has a hope of working.
+_PORT=`awk 'BEGIN {srand()} END {printf "%.0f\n", (rand() * 450 + 20050)}'< /dev/null`
+
 AT_DATA(test_keys, [@<:@pubkey address@hidden@:>@
 MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCfN/cAMabgb6T7m8ksGnpQ7LO6hOdnc/7V
 yivrRGtmpwSItljht1bmgLQF37KiSPoMEDUb1stfKxaMsYiy8iTyoQ+M2EVFP37n2rtnNZ0H
@@ -336,13 +340,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 serve localhost:5555 $2 &
+MONOTONE --db=test$1.db --rcfile=netsync.lua serve localhost:$_PORT $2 &
 sleep 4
 ])
 # run as NETSYNC_SERVE_START(collection name)
 m4_define([NETSYNC_SERVE_START], [
 NETSYNC_KILLHARD
-MONOTONE --rcfile=netsync.lua serve localhost:5555 $1 &
+MONOTONE --rcfile=netsync.lua serve localhost:$_PORT $1 &
 sleep 4
 ])
 # run as NETSYNC_SERVE_STOP
@@ -354,7 +358,7 @@
 # run as NETSYNC_CLIENT_N_RUN(2|3, push|pull|sync, collection name[, expected result])
 # first argument chooses whether to use the 2nd or 3rd database
 m4_define([NETSYNC_CLIENT_N_RUN], [
-AT_CHECK(MONOTONE --db=test$1.db --rcfile=netsync.lua $2 localhost:5555 $3, [$4], [ignore], [ignore])
+AT_CHECK(MONOTONE --db=test$1.db --rcfile=netsync.lua $2 localhost:$_PORT $3, [$4], [ignore], [ignore])
 ])
 # run as NETSYNC_CLIENT_RUN(push|pull|sync, collection name[, expected result])
 m4_define([NETSYNC_CLIENT_RUN], [