# 
# 
# patch "ChangeLog"
#  from [079a4b3cef2218ef7aeb4a57a548b2720af47ce4]
#    to [9055c1714465622958770ef2764c4bf1f326e7a9]
# 
# patch "tests/t_netsync_permissions.at"
#  from [9a8356b76404d50e044f74e5f59d6e055ad64d1e]
#    to [87dc95a12b9958865c43bb1fe93ca3944eaee956]
# 
# patch "testsuite.at"
#  from [3f40181b4e040f5153c40ee6da60880f1cad3209]
#    to [234fbe9860a5cdc1c897c085fbaa0f20fe989307]
# 
============================================================
--- ChangeLog	079a4b3cef2218ef7aeb4a57a548b2720af47ce4
+++ ChangeLog	9055c1714465622958770ef2764c4bf1f326e7a9
@@ -1,3 +1,13 @@
+2006-02-19  Matthew Gregan  <address@hidden>
+
+	* testsuite.at: Add a REVERT_TO variant that allows use of
+	alternate databases.
+
+	* tests/t_netsync_permissions.at: Attempt to avoid a database
+	locking race in this test that is causing spurious failures by
+	using the new REVERT_TO variant to cause revert to be performed
+	using the "client" database.
+
 2006-02-19  Nathaniel Smith  <address@hidden>
 
 	* roster.cc (shallow_equal): Publically expose.
============================================================
--- tests/t_netsync_permissions.at	9a8356b76404d50e044f74e5f59d6e055ad64d1e
+++ tests/t_netsync_permissions.at	87dc95a12b9958865c43bb1fe93ca3944eaee956
@@ -69,7 +69,7 @@
 
 AT_CHECK(cp test.db test2.db)
 AT_CHECK(rm -r keys2 && cp -r keys/ keys2)
-REVERT_TO($BASE)
+REVERT_N_TO(2, $BASE)
 ADD_FILE(default, [default
 ])
 AT_CHECK(MONOTONE2 commit --message default, [], [ignore], [ignore])
@@ -78,7 +78,7 @@
 
 # push with other key
 
-REVERT_TO($BASE)
+REVERT_N_TO(2, $BASE)
 ADD_FILE(other, [other
 ])
 AT_CHECK(MONOTONE2 commit --message other, [], [ignore], [ignore])
@@ -87,7 +87,7 @@
 
 # push with unknown key fails
 
-REVERT_TO($BASE)
+REVERT_N_TO(2, $BASE)
 ADD_FILE(unknown, [unknown
 ])
 AT_CHECK(MONOTONE2 commit --message unknown, [], [ignore], [ignore])
@@ -164,7 +164,7 @@
 
 AT_CHECK(cp test.db test2.db)
 AT_CHECK(rm -r keys2 && cp -r keys/ keys2)
-REVERT_TO($BASE)
+REVERT_N_TO(2, $BASE)
 ADD_FILE(default, [default
 ])
 AT_CHECK(MONOTONE2 commit --message default, [], [ignore], [ignore])
@@ -173,7 +173,7 @@
 
 # push with other key
 
-REVERT_TO($BASE)
+REVERT_N_TO(2, $BASE)
 ADD_FILE(other, [other
 ])
 AT_CHECK(MONOTONE2 commit --message other, [], [ignore], [ignore])
@@ -182,7 +182,7 @@
 
 # push with unknown key fails
 
-REVERT_TO($BASE)
+REVERT_N_TO(2, $BASE)
 ADD_FILE(unknown, [unknown
 ])
 AT_CHECK(MONOTONE2 commit --message unknown, [], [ignore], [ignore])
============================================================
--- testsuite.at	3f40181b4e040f5153c40ee6da60880f1cad3209
+++ testsuite.at	234fbe9860a5cdc1c897c085fbaa0f20fe989307
@@ -209,6 +209,17 @@
 AT_CHECK(test $PROBE_F_SHA = $3)
 ])
 
+# run as REVERT_N_TO(2|3, rsha[, branch])
+m4_define([REVERT_N_TO], [
+AT_CHECK(rm -rf MT.old)
+AT_CHECK(mv  MT MT.old)
+m4_case([$3],
+        [], [AT_CHECK(MONOTONE$1 checkout --revision=$2 ., [], [ignore])],
+        [AT_CHECK(MONOTONE$1 --branch=$3 checkout --revision=$2 ., [], [ignore])])
+PROBE_R_SHA=`BASE_REVISION`
+AT_CHECK(test $PROBE_R_SHA = $2)
+])
+
 # run as REVERT_TO(rsha[,branch])
 m4_define([REVERT_TO], [ 
 AT_CHECK(rm -rf MT.old)