# 
# patch "ChangeLog"
#  from [f0ef1efea7f4cba22c4db39df94715fc939205d8]
#    to [e39f1771c98c4baf2aebff35c0c9db8aa520a85b]
# 
# patch "tests/t_merge_add_del.at"
#  from [58de59647d08dafa560874052a1968a95b14ec48]
#    to [82df57eb4cca39c60859158ff1dca16c0ee4f557]
# 
# patch "testsuite.at"
#  from [43f122fb62bbdc803bfae1b371a3fb57d6d5bcfa]
#    to [4574965e47126b91ab46a390639effd6d2917e92]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2005-04-19  Richard Levitte  <address@hidden>
+
+	* testsuite.at (REVERT_TO): Make it possible to revert to a
+	specific branch.  This is useful to resolve ambiguities.
+	* tests/t_merge_add_del.at: Use it.
+
 2005-04-19  Matthew Gregan  <address@hidden>
 
 	* commands.cc (log): 'depth' option did not handle the single file
--- tests/t_merge_add_del.at
+++ tests/t_merge_add_del.at
@@ -55,7 +55,7 @@
 AT_CHECK(MONOTONE --branch=branch.fork merge, [], [ignore], [ignore])
 
 # produce state E
-REVERT_TO($C_REVISION_SHA)
+REVERT_TO($C_REVISION_SHA,branch.main)
 AT_CHECK(MONOTONE --branch=branch.main drop bar, [], [ignore], [ignore])
 AT_CHECK(MONOTONE --branch=branch.main commit --message 'state E - drop bar', [], [ignore], [ignore])
 E_REVISION_SHA=`BASE_REVISION`
--- testsuite.at
+++ testsuite.at
@@ -197,11 +197,13 @@
 AT_CHECK(test $PROBE_F_SHA = $3)
 ])
 
-# run as REVERT_TO(rsha)
+# run as REVERT_TO(rsha[,branch])
 m4_define([REVERT_TO], [ 
 AT_CHECK(rm -rf MT.old)
 AT_CHECK(mv  MT MT.old)
-AT_CHECK(MONOTONE checkout $1 ., [], [ignore])
+m4_case([$2],
+        [], [AT_CHECK(MONOTONE checkout $1 ., [], [ignore])],
+        [AT_CHECK(MONOTONE --branch=$2 checkout $1 ., [], [ignore])])
 AT_CHECK(mv MT.old/options MT)
 PROBE_R_SHA=`BASE_REVISION`
 AT_CHECK(test $PROBE_R_SHA = $1)