# # # patch "tests/importing_cvs_branches/__driver__.lua" # from [a656eebb5ccd033dd7b1b595479916cf82003fb6] # to [d44ea3f284a797f45295b5384ca496545d8fbbb7] # # patch "tests/importing_cvs_branches2/__driver__.lua" # from [087b4df60a32631d9d2e58c018827790049a83d3] # to [3cdb06f80b28dde254022837bf3b22c8bf2ac5c2] # ============================================================ --- tests/importing_cvs_branches/__driver__.lua a656eebb5ccd033dd7b1b595479916cf82003fb6 +++ tests/importing_cvs_branches/__driver__.lua d44ea3f284a797f45295b5384ca496545d8fbbb7 @@ -49,6 +49,6 @@ check(samefile("changelog.3", "branchdir check(samefile("changelog.3", "branchdir/changelog")) -- get the log of the branch to check for correct branchpoint -check(indir("branchdir", mtn("log")), 0, true, false) +check(indir("branchdir", mtn("log", "--no-graph")), 0, true, false) check(grep("commit on branch", "stdout"), 0, false, false) check(grep("initial import", "stdout"), 0, false, false) ============================================================ --- tests/importing_cvs_branches2/__driver__.lua 087b4df60a32631d9d2e58c018827790049a83d3 +++ tests/importing_cvs_branches2/__driver__.lua 3cdb06f80b28dde254022837bf3b22c8bf2ac5c2 @@ -73,7 +73,7 @@ check(samefile("changelog.D.5", "branchD check(samefile("changelog.D.5", "branchD/changelog")) -- check the log of branch A for correctness -check(indir("branchA", mtn("log")), 0, true, false) +check(indir("branchA", mtn("log", "--no-graph")), 0, true, false) check(grep("initial import", "stdout"), 0, false, false) check(grep("first commit", "stdout"), 0, false, false) check(grep("commit on branch A", "stdout"), 0, false, false) @@ -82,7 +82,7 @@ check(grep("commit on branch D", "stdout check(grep("commit on branch D", "stdout"), 1, false, false) -- check the log of branch C for correctness -check(indir("branchC", mtn("log")), 0, true, false) +check(indir("branchC", mtn("log", "--no-graph")), 0, true, false) check(grep("initial import", "stdout"), 0, false, false) check(grep("first commit", "stdout"), 0, false, false) check(grep("commit on branch A", "stdout"), 0, false, false) @@ -91,7 +91,7 @@ check(grep("commit on branch D", "stdout check(grep("commit on branch D", "stdout"), 1, false, false) -- check the log of branch D for correctness -check(indir("branchD", mtn("log")), 0, true, false) +check(indir("branchD", mtn("log", "--no-graph")), 0, true, false) check(grep("initial import", "stdout"), 0, false, false) check(grep("first commit", "stdout"), 0, false, false) check(grep("commit on branch A", "stdout"), 0, false, false)