#
#
# patch "mtn_cvs/tests/push_loop_check_log/__driver__.lua"
#  from [6c3f86bc27a79e80291f69bc59fb5212e5fe944c]
#    to [3c9ce6542da625ca2cc3a01a8f363e6286fb8ba6]
#
============================================================
--- mtn_cvs/tests/push_loop_check_log/__driver__.lua	6c3f86bc27a79e80291f69bc59fb5212e5fe944c
+++ mtn_cvs/tests/push_loop_check_log/__driver__.lua	3c9ce6542da625ca2cc3a01a8f363e6286fb8ba6
@@ -27,7 +27,7 @@ check(cvs("co", "test"), 0, false, false
 base = string.sub(heads,0,40)
 
 check(cvs("co", "test"), 0, false, false)
-writefile("test/A","A\nchange\nB\nC\nD\nE\nF\nG\nH\nI\nJ\nK\n")
+writefile("test/A","A\n-\nB\nC\nD\nE\nF\nG\nH\nI\nJ\nK\n")
 check(indir("test", cvs("ci", "-m", "messageA")), 0, false, false)
 
 check(mtn_cvs("--branch=testbranch","pull",cvsroot,"test"),0, false,false)
@@ -37,7 +37,7 @@ rev1 = string.sub(heads,0,40)
 heads = readfile("stdout")
 rev1 = string.sub(heads,0,40)
 
-writefile("test/A","A\ncahnge\nB\nchange\nC\nD\nE\nF\nG\nH\nI\nJ\nK\n")
+writefile("test/A","A\n-\nB\n-\nC\nD\nE\nF\nG\nH\nI\nJ\nK\n")
 check(indir("test", cvs("ci", "-m", "messageB")), 0, false, false)
 
 check(mtn_cvs("--branch=testbranch","pull",cvsroot,"test"),0, false,false)
@@ -49,43 +49,51 @@ check(mtn("co","--branch=testbranch","te
 
 check(mtn("co","--branch=testbranch","test-mtn"),0, false, false)
 
-check(indir("test-mtn", mtn("up", "-r", base)), 0, false, false)
-
-writefile("test-mtn/A","A\nB\nC\nchange\nD\nE\nF\nG\nH\nI\nJ\nK\n")
+writefile("test-mtn/A","A\n-\nB\n-\nC\n-\nD\nE\nF\nG\nH\nI\nJ\nK\n")
 check(indir("test-mtn", mtn("ci", "-m", "mtn-messageC")), 0, false, false)
+writefile("test-mtn/A","A\n-\nB\n-\nC\n-\nD\n-\nE\nF\nG\nH\nI\nJ\nK\n")
+check(indir("test-mtn", mtn("ci", "-m", "mtn-messageD")), 0, false, false)
 
-writefile("test-mtn/A","A\nB\nC\nchange\nD\nchange\nE\nF\nG\nH\nI\nJ\nK\n")
-check(indir("test-mtn", mtn("ci", "-m", "mtn-messageD")), 0, false, false)
+check(mtn("automate", "heads"), 0, true, false)
+canonicalize("stdout")
+heads = readfile("stdout")
+rev3 = string.sub(heads,0,40)
 
-check(indir("test-mtn", mtn("up", "-r", rev1)), 0, false, false)
+check(indir("test-mtn",mtn_cvs("--branch=testbranch","push","--first")),0, false,false)
 
-writefile("test-mtn/A","A\nchange\nB\nC\nD\nE\nchange\nF\nG\nH\nI\nJ\nK\n")
+check(indir("test-mtn", mtn("up", "-r", base)), 0, false, false)
+
+writefile("test-mtn/A","A\n\nB\nC\nD\nE\n-\nF\nG\nH\nI\nJ\nK\n")
 check(indir("test-mtn", mtn("ci", "-m", "mtn-messageE")), 0, false, false)
-writefile("test-mtn/A","A\nchange\nB\nC\nD\nE\nchange\nF\nchange\nG\nH\nI\nJ\nK\n")
+writefile("test-mtn/A","A\n\nB\nC\nD\nE\n-\nF\n-\nG\nH\nI\nJ\nK\n")
 check(indir("test-mtn", mtn("ci", "-m", "mtn-messageF")), 0, false, false)
 
-check(mtn("merge"), 0, false, false)
+check(indir("test-mtn", mtn("up", "-r", rev1)), 0, false, false)
 
-check(indir("test-mtn", mtn("up")), 0, false, false)
-
-writefile("test-mtn/A","A\nB\nC\nD\nE\nF\nG\nchange\nH\nI\nJ\nK\n")
+writefile("test-mtn/A","A\nB\nC\nD\nE\nF\nG\n-\nH\nI\nJ\nK\n")
 check(indir("test-mtn", mtn("ci", "-m", "mtn-messageG")), 0, false, false)
-
-writefile("test-mtn/A","A\nB\nC\nD\nE\nF\nG\nchange\nH\nchange\nI\nJ\nK\n")
+writefile("test-mtn/A","A\nB\nC\nD\nE\nF\nG\n-\nH\n-\nI\nJ\nK\n")
 check(indir("test-mtn", mtn("ci", "-m", "mtn-messageH")), 0, false, false)
 
+check(mtn("merge"), 0, false, false)
 
-check(indir("test-mtn", mtn("up", "-r", rev2)), 0, false, false)
+check(indir("test-mtn", mtn("up")), 0, false, false)
 
-writefile("test-mtn/A","A\ncahnge\nB\nchange\nC\nD\nE\nF\nG\nH\nI\nchange\nJ\nK\n")
+writefile("test-mtn/A","A\n-\nB\n-\nC\n-\nD\n-\nE\n-\nF\n-\nG\n-\nH\n-\nI\n-\nJ\nK\n")
 check(indir("test-mtn", mtn("ci", "-m", "mtn-messageI")), 0, false, false)
+writefile("test-mtn/A","A\n-\nB\n-\nC\n-\nD\n-\nE\n-\nF\n-\nG\n-\nH\n-\nI\n-\nJ\n-\nK\n")
+check(indir("test-mtn", mtn("ci", "-m", "mtn-messageJ")), 0, false, false)
 
-writefile("test-mtn/A","A\ncahnge\nB\nchange\nC\nD\nE\nF\nG\nH\nI\nchange\nJ\nchange\nK\n")
-check(indir("test-mtn", mtn("ci", "-m", "mtn-messageJ")), 0, false, false)
+check(indir("test-mtn", mtn("up", "-r", rev3)), 0, false, false)
 
+writefile("test-mtn/A","A\n-\nB\n-\nC\n-\nD\n-\nE\nF\nG\nH\nI\nJ\nK\n-\nL\nM\n")
+check(indir("test-mtn", mtn("ci", "-m", "mtn-messageK")), 0, false, false)
+writefile("test-mtn/A","A\n-\nB\n-\nC\n-\nD\n-\nE\nF\nG\nH\nI\nJ\nK\n-\nL\n-\nM\n")
+check(indir("test-mtn", mtn("ci", "-m", "mtn-messageL")), 0, false, false)
+
 check(mtn("merge"), 0, false, false)
 
-check(mtn_cvs("--branch=testbranch","push","--first"),0, false,false)
+check(indir("test-mtn", mtn_cvs("--branch=testbranch","push","--first")),0, false,false)
 
 check(indir("test", cvs("up")), 0, false, false)
 
@@ -103,4 +111,6 @@ check(countMatch(log, "messageJ") == 1, 
 check(countMatch(log, "messageH") == 1, true, false, false)
 check(countMatch(log, "messageI") == 1, true, false, false)
 check(countMatch(log, "messageJ") == 1, true, false, false)
+check(countMatch(log, "messageK") == 1, true, false, false)
+check(countMatch(log, "messageL") == 1, true, false, false)