#
#
# patch "tests/automate_get_current_revision/__driver__.lua"
#  from [a56d2598ca7be71521f38b0a577baa92fbf55022]
#    to [28c2e940b78735416285d4f62fc5ed3cbf3ca96e]
# 
# patch "tests/conflict_messages/__driver__.lua"
#  from [4294e488db07d33260abd6ab276fc85d9c2dd508]
#    to [6acf670a90d3dd30e909fb3ceff0dbccec15e67c]
#
============================================================
--- tests/automate_get_current_revision/__driver__.lua	a56d2598ca7be71521f38b0a577baa92fbf55022
+++ tests/automate_get_current_revision/__driver__.lua	28c2e940b78735416285d4f62fc5ed3cbf3ca96e
@@ -1,9 +1,9 @@ check(mtn("commit", "--date=2005-05-21T1
 
 mtn_setup()
 
 addfile("zoo", "blah\n")
 check(mtn("commit", "--date=2005-05-21T12:30:51",
-          "--branch=testbranch", "--message=blah-blah"), 0, false, false) 
+          "--message=blah-blah"), 0, false, false) 
           
 -- ensure clear workspace fails wih error
 check(mtn("automate", "get_current_revision"), 1, true, false)
============================================================
--- tests/conflict_messages/__driver__.lua	4294e488db07d33260abd6ab276fc85d9c2dd508
+++ tests/conflict_messages/__driver__.lua	6acf670a90d3dd30e909fb3ceff0dbccec15e67c
@@ -944,7 +944,8 @@ check(qgrep(message3, "stderr"))
 check(qgrep(message1, "stderr"))
 check(qgrep(message2, "stderr"))
 check(qgrep(message3, "stderr"))
-check(indir(dir2, mtn("commit", "--message", "commit", "--branch", branch .. "-propagate")), 0, false, false)
+check(indir(dir2, mtn("branch", branch .. "-propagate")), 0, false, false)
+check(indir(dir2, mtn("commit", "--message", "commit")), 0, false, false)
 
 second = indir(dir2, {base_revision})[1]()
 
@@ -1004,7 +1005,8 @@ message2 = "conflict: duplicate name"
 -- check(qgrep(message1, "stderr"))
 -- check(qgrep(message2, "stderr"))
 
-check(mtn("commit", "--message", "commit", "--branch", branch .. "-propagate"), 0, false, false)
+check(mtn("branch", branch .. "-propagate"), 0, false, false)
+check(mtn("commit", "--message", "commit"), 0, false, false)
 
 second = base_revision()