# 
# 
# patch "ChangeLog"
#  from [7cd030835aaa386807481db9549ee32fad1196f0]
#    to [dfc56304c8a166ca5eaff09cfc4c72338eb409e4]
# 
# patch "tests/t_netsync_permissions.at"
#  from [87dc95a12b9958865c43bb1fe93ca3944eaee956]
#    to [14dc033954a1e36979893b0f9b4d5daf4be18b82]
# 
# patch "testsuite.at"
#  from [234fbe9860a5cdc1c897c085fbaa0f20fe989307]
#    to [42c13852b30213693f6dd5120305f735bc114fcd]
# 
============================================================
--- ChangeLog	7cd030835aaa386807481db9549ee32fad1196f0
+++ ChangeLog	dfc56304c8a166ca5eaff09cfc4c72338eb409e4
@@ -1,3 +1,11 @@
+2006-02-20  Matthew Gregan  <address@hidden>
+
+	* testsuite.at: Add an ADD_FILE variant that allows use of
+	alternate databases.
+
+	* tests/t_netsync_permissions.at: Missed some cases of the
+	database locking race.
+
 2006-02-19  Nathaniel Smith  <address@hidden>
 
 	* ChangeLog: Fixup after xxdiff lossage.
============================================================
--- tests/t_netsync_permissions.at	87dc95a12b9958865c43bb1fe93ca3944eaee956
+++ tests/t_netsync_permissions.at	14dc033954a1e36979893b0f9b4d5daf4be18b82
@@ -70,7 +70,7 @@
 AT_CHECK(cp test.db test2.db)
 AT_CHECK(rm -r keys2 && cp -r keys/ keys2)
 REVERT_N_TO(2, $BASE)
-ADD_FILE(default, [default
+ADD_N_FILE(2, default, [default
 ])
 AT_CHECK(MONOTONE2 commit --message default, [], [ignore], [ignore])
 DEFAULT_REV=`BASE_REVISION`
@@ -79,7 +79,7 @@
 # push with other key
 
 REVERT_N_TO(2, $BASE)
-ADD_FILE(other, [other
+ADD_N_FILE(2, other, [other
 ])
 AT_CHECK(MONOTONE2 commit --message other, [], [ignore], [ignore])
 OTHER_REV=`BASE_REVISION`
@@ -88,7 +88,7 @@
 # push with unknown key fails
 
 REVERT_N_TO(2, $BASE)
-ADD_FILE(unknown, [unknown
+ADD_N_FILE(2, unknown, [unknown
 ])
 AT_CHECK(MONOTONE2 commit --message unknown, [], [ignore], [ignore])
 UNKNOWN_REV=`BASE_REVISION`
@@ -116,7 +116,7 @@
 AT_CHECK(rm -r keys && cp -r clean_keys/ keys)
 AT_DATA(MT/revision [])
 
-ADD_FILE(testfile, [testfile
+ADD_N_FILE(2, testfile, [testfile
 ])
 AT_CHECK(MONOTONE --branch=testbranch commit --message testfile, [], [ignore], [ignore])
 BASE=`BASE_REVISION`
@@ -165,7 +165,7 @@
 AT_CHECK(cp test.db test2.db)
 AT_CHECK(rm -r keys2 && cp -r keys/ keys2)
 REVERT_N_TO(2, $BASE)
-ADD_FILE(default, [default
+ADD_N_FILE(2, default, [default
 ])
 AT_CHECK(MONOTONE2 commit --message default, [], [ignore], [ignore])
 DEFAULT_REV=`BASE_REVISION`
@@ -174,7 +174,7 @@
 # push with other key
 
 REVERT_N_TO(2, $BASE)
-ADD_FILE(other, [other
+ADD_N_FILE(2, other, [other
 ])
 AT_CHECK(MONOTONE2 commit --message other, [], [ignore], [ignore])
 OTHER_REV=`BASE_REVISION`
@@ -183,7 +183,7 @@
 # push with unknown key fails
 
 REVERT_N_TO(2, $BASE)
-ADD_FILE(unknown, [unknown
+ADD_N_FILE(2, unknown, [unknown
 ])
 AT_CHECK(MONOTONE2 commit --message unknown, [], [ignore], [ignore])
 UNKNOWN_REV=`BASE_REVISION`
============================================================
--- testsuite.at	234fbe9860a5cdc1c897c085fbaa0f20fe989307
+++ testsuite.at	42c13852b30213693f6dd5120305f735bc114fcd
@@ -231,6 +231,12 @@
 AT_CHECK(test $PROBE_R_SHA = $1)
 ])
 
+# run as ADD_N_FILE(2|3, filename, data)
+m4_define([ADD_N_FILE], [
+AT_DATA($2, $3)
+AT_CHECK(MONOTONE$1 add $2, [], [ignore], [ignore])
+])
+
 # run as ADD_FILE(filename, data)
 m4_define([ADD_FILE], [
 AT_DATA($1, $2)