# 
# 
# patch "ChangeLog"
#  from [925d81d543463205ddb43e9210f2fc5f8926f8c3]
#    to [cbaa91757748dd344a19710bfd1082033228b6da]
# 
# patch "tests/t_update_off_branch.at"
#  from [00ba1adec31e5d98436ef58ea31579df603396a9]
#    to [0a795cf6e182e2f8f2f5a9bea020b96177c4d3a0]
# 
============================================================
--- ChangeLog	925d81d543463205ddb43e9210f2fc5f8926f8c3
+++ ChangeLog	cbaa91757748dd344a19710bfd1082033228b6da
@@ -1,3 +1,10 @@
+2006-03-23  Richard Levitte  <address@hidden>
+
+	* tests/t_update_off_branch.at: Instead of retrying the update
+	by specifying the branch of the off-branch revision, check that
+	the branch specified in MT/options has changed automagically to
+	the intended revision's branch.
+
 2006-03-22  Matt Johnston  <address@hidden>
 
 	* commands.cc (CMD(update)): update the workspace branch
============================================================
--- tests/t_update_off_branch.at	00ba1adec31e5d98436ef58ea31579df603396a9
+++ tests/t_update_off_branch.at	0a795cf6e182e2f8f2f5a9bea020b96177c4d3a0
@@ -12,7 +12,7 @@
 OR=`BASE_REVISION`
 
 AT_CHECK(MONOTONE checkout --branch=testbranch --revision=$TR codir, [], [ignore], [ignore])
-AT_CHECK(cd codir && MONOTONE update --revision=$OR, [1], [ignore], [ignore])
-AT_CHECK(cd codir && MONOTONE update --branch=otherbranch --revision=$OR, [], [ignore], [ignore])
+AT_CHECK(cd codir && MONOTONE update --revision=$OR, [], [ignore], [ignore])
+AT_CHECK(grep '^ *branch "otherbranch"' MT/options, [], [ignore], [ignore])
 
 AT_CLEANUP