# 
# patch "ChangeLog"
#  from [1f9edcb0435428e13842a6020da415765f68c50e]
#    to [06dba49fc520bddcfb658acf49c37613680a79bf]
# 
# patch "tests/t_add_stomp_file.at"
#  from [5bbd2eb4c43a8400477107da7c242e63596650b3]
#    to [1e74d89b26c8f9b81662ecda31737f65e9f97223]
# 
# patch "tests/t_add_vs_commit.at"
#  from [92280abe24d27ced1ce60d8b8e87efc310be4550]
#    to [de9cf601f5c2c74d2432eb4fc0531d7a572cd673]
# 
# patch "tests/t_netsync_unrelated.at"
#  from [b8f19e4d89439d8ab409731dbc5361099ae450e7]
#    to [e267f934990722a892df9ef39c96c3407b327f03]
# 
# patch "tests/t_persistent_server_keys_2.at"
#  from [f974ca0aba33b2107a1fd7677ded50faa52b3a05]
#    to [63a6ad1e1eebabf989fa1d061cb8194614caf134]
# 
========================================================================
--- ChangeLog	1f9edcb0435428e13842a6020da415765f68c50e
+++ ChangeLog	06dba49fc520bddcfb658acf49c37613680a79bf
@@ -1,5 +1,13 @@
 2005-09-03  Matthew Gregan  <address@hidden>
 
+	* tests/t_persistent_server_keys_2.at: 'commit' needs a commit
+	message.  Un-XFAIL.
+	* tests/t_netsync_unrelated.at: Fix 'setup' syntax.
+	* tests/t_add_vs_commit.at: BASE_REVISION needs to be in the root
+	of a working copy to work.  Un-XFAIL.
+	* tests/t_add_stomp_file.at: 'add' does not take a --branch
+	argument.  BASE_REVISION needs to be in the root of a working copy
+	to work.
 	* annotate.cc (build_parent_lineage): Don't access uninitialized
 	memory--use resize() rather than reserve().
 
========================================================================
--- tests/t_add_stomp_file.at	5bbd2eb4c43a8400477107da7c242e63596650b3
+++ tests/t_add_stomp_file.at	1e74d89b26c8f9b81662ecda31737f65e9f97223
@@ -26,16 +26,16 @@
 AT_CHECK(mkdir alicewd)
 AT_CHECK(cp initial alicewd/initial)
 AT_CHECK(MONOTONE --branch=testbranch setup alicewd, [], [ignore], [ignore])
-AT_CHECK( (cd alicewd; MONOTONE --branch=testbranch --root=. add initial), [], [ignore], [ignore])
+AT_CHECK( (cd alicewd; MONOTONE --root=. add initial), [], [ignore], [ignore])
 AT_CHECK( (cd alicewd; MONOTONE --branch=testbranch --root=. commit -m 'initial commit'), [], [ignore], [ignore])
 AT_CHECK(cp foo.alice alicewd/foo)
 
 # Bob does add of file foo, and commits
 AT_CHECK(MONOTONE --branch=testbranch checkout bobwd, [], [ignore], [ignore])
 AT_CHECK(cp foo.bob bobwd/foo)
-AT_CHECK( (cd bobwd; MONOTONE --branch=testbranch --root=. add foo), [], [ignore], [ignore])
+AT_CHECK( (cd bobwd; MONOTONE --root=. add foo), [], [ignore], [ignore])
 AT_CHECK( (cd bobwd; MONOTONE --branch=testbranch --root=. commit -m 'bob commit'), [], [ignore], [ignore])
-REV=`BASE_REVISION`
+REV=`cd bobwd; BASE_REVISION`
 
 # Alice does her update, discovers foo has been stomped!
 AT_CHECK( (cd alicewd; MONOTONE --branch=testbranch --root=. update --revision=$REV), [], [ignore], [ignore])
========================================================================
--- tests/t_add_vs_commit.at	92280abe24d27ced1ce60d8b8e87efc310be4550
+++ tests/t_add_vs_commit.at	de9cf601f5c2c74d2432eb4fc0531d7a572cd673
@@ -1,14 +1,9 @@
 AT_SETUP([add working copy commit in another])
 MONOTONE_SETUP
 
-# This test is a bug report
-AT_XFAIL_IF(true)
-
 # 1. Alice writes a file, does an add, *doesn't* do a commit, and sends patch
 # 2. Bob applies (modified) patch to tree, does the add, then a commit.
 # 3. Now Alice does an update (resolves the merge conflict, choosing Bob's changes).
-#
-# Alice's working dir now give I()'s when she tries to do stuff (diff, update, etc.).
 
 AT_DATA(initial, [some initial data
 ])
@@ -38,7 +33,7 @@
 AT_CHECK(cp foo.bob bobwd/foo)
 AT_CHECK( (cd bobwd; MONOTONE --root=. add foo), [], [ignore], [ignore])
 AT_CHECK( (cd bobwd; MONOTONE --root=. commit -m 'bob commit'), [], [ignore], [ignore])
-REV=`BASE_REVISION`
+REV=`cd bobwd; BASE_REVISION`
 
 # Alice does her update, then attempts, eg., a diff
 AT_CHECK( (cd alicewd; MONOTONE --root=. update --revision=$REV), [], [ignore], [ignore])
========================================================================
--- tests/t_netsync_unrelated.at	b8f19e4d89439d8ab409731dbc5361099ae450e7
+++ tests/t_netsync_unrelated.at	e267f934990722a892df9ef39c96c3407b327f03
@@ -32,7 +32,7 @@
 CHECK_SAME_STDOUT(MONOTONE ls certs $BASE, MONOTONE ls certs $BASE)
 
 AT_CHECK(rm -rf MT)
-AT_CHECK(MONOTONE setup --branch=testbranch., [], [ignore], [ignore])
+AT_CHECK(MONOTONE setup --branch=testbranch ., [], [ignore], [ignore])
 
 ADD_FILE(testfile2, [This is test file 2
 ])
========================================================================
--- tests/t_persistent_server_keys_2.at	f974ca0aba33b2107a1fd7677ded50faa52b3a05
+++ tests/t_persistent_server_keys_2.at	63a6ad1e1eebabf989fa1d061cb8194614caf134
@@ -1,14 +1,8 @@
 AT_SETUP([(imp) persistent netsync server - keys 2])
 AT_KEYWORDS(netsync)
 MONOTONE_SETUP
 NETSYNC_SETUP
 
-# This test is a bug report
-AT_XFAIL_IF(true)
-# Probably this one should not be fixed directly, but by implementing
-# the changes described in t_netsync_diffbranch.at, which would solve
-# it automatically.  OTOH, a fix for this wouldn't be a _bad_ thing.
-
 # This tests a somewhat subtle version of how public keys are handled
 # with netsync.  The rule is, we serve a key if we're serving any cert
 # signed by that key.  The question is, if when we boot up the server
@@ -25,7 +19,7 @@
 
 ADD_FILE(foo, [data data blah
 ])
-AT_CHECK(MONOTONE2 commit address@hidden --branch=testbranch blah, [], [ignore], [ignore])
+AT_CHECK(MONOTONE2 commit address@hidden --branch=testbranch -m 'commit foo' foo, [], [ignore], [ignore])
 
 NETSYNC_SERVE_START(testbranch)
 NETSYNC_CLIENT_N_RUN(2, push, testbranch)