# 
# patch "ChangeLog"
#  from [175848a819a8093259879618e17761b6919021dc]
#    to [dbed68c08f5bbda72e46fd6f3a557246e9f585a6]
# 
# patch "tests/t_netsync_defaults.at"
#  from [c041c4c1f93c04041b0fb53257e56c4b3b24a2cf]
#    to [ad699c5f7470abec2b97ac1b4d0f71250d134d25]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-07-04  Nathaniel Smith  <address@hidden>
 
+	* tests/t_netsync_defaults.at: Update for new var names.  All
+	tests now pass.
+
+2005-07-04  Nathaniel Smith  <address@hidden>
+
 	* lua.cc (hook_get_netsync_write_permitted): Fix typo.
 
 2005-07-04  Nathaniel Smith  <address@hidden>
--- tests/t_netsync_defaults.at
+++ tests/t_netsync_defaults.at
@@ -22,21 +22,21 @@
 
 # First make sure netsync with explicit server/pattern override defaults
 AT_CHECK(MONOTONE2 set database default-server nonsense, [], [ignore], [ignore])
-AT_CHECK(MONOTONE2 set database default-pattern nonsense, [], [ignore], [ignore])
+AT_CHECK(MONOTONE2 set database default-include-pattern nonsense, [], [ignore], [ignore])
 NETSYNC_CLIENT_RUN(pull, testbranch, 0)
 AT_CHECK(MONOTONE2 checkout --branch=testbranch --revision=$TESTBRANCH_R testdir1, [], [ignore], [ignore])
 AT_CHECK(test -f testdir1/testfile)
 
 # Now make sure explicit server with default pattern works...
 AT_CHECK(MONOTONE2 set database default-server nonsense, [], [ignore], [ignore])
-AT_CHECK(MONOTONE2 set database default-pattern otherbranch, [], [ignore], [ignore])
+AT_CHECK(MONOTONE2 set database default-include-pattern otherbranch, [], [ignore], [ignore])
 NETSYNC_CLIENT_RUN(pull, [])
 AT_CHECK(MONOTONE2 checkout --branch=otherbranch --revision=$OTHERBRANCH_R testdir2, [], [ignore], [ignore])
 AT_CHECK(test -f testdir2/testfile)
 
-# And finally, 
+# And finally, make sure that passing nothing at all also works (uses default)
 AT_CHECK(MONOTONE2 set database default-server 127.0.0.1:$_PORT, [], [ignore], [ignore])
-AT_CHECK(MONOTONE2 set database default-pattern thirdbranch, [], [ignore], [ignore])
+AT_CHECK(MONOTONE2 set database default-include-pattern thirdbranch, [], [ignore], [ignore])
 AT_CHECK(MONOTONE2 sync, [], [ignore], [ignore])
 AT_CHECK(MONOTONE2 checkout --branch=thirdbranch --revision=$THIRDBRANCH_R testdir3, [], [ignore], [ignore])
 AT_CHECK(test -f testdir3/testfile)