# 
# patch "ChangeLog"
#  from [9c1933d220ac12975bfac1c54c39fbbd218419b3]
#    to [af0892bf7b0572c6a7c2802b26af3429957b4f8e]
# 
# patch "tests/t_add_vs_commit.at"
#  from [92280abe24d27ced1ce60d8b8e87efc310be4550]
#    to [0310fbe9e1d0d2b638648637351d196632e7a94a]
# 
========================================================================
--- ChangeLog	9c1933d220ac12975bfac1c54c39fbbd218419b3
+++ ChangeLog	af0892bf7b0572c6a7c2802b26af3429957b4f8e
@@ -1,5 +1,11 @@
 2005-08-24  Timothy Brownawell  <address@hidden>
 
+	* tests/t_add_vs_commit.at: Fix BASE_REVISION usage for the working
+	dir of interest not being '.' .
+	remove XFAIL
+
+2005-08-24  Timothy Brownawell  <address@hidden>
+
 	* tests/t_merge_add_rename_add.at: remove XFAIL
 	The result of this merge (<mv a b>, <add b>) are now defined: call
 	the resolve_path_conflicts hook with a "collision" type conflict.
========================================================================
--- tests/t_add_vs_commit.at	92280abe24d27ced1ce60d8b8e87efc310be4550
+++ tests/t_add_vs_commit.at	0310fbe9e1d0d2b638648637351d196632e7a94a
@@ -1,14 +1,10 @@
 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 +34,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])