# 
# 
# patch "tests/_--author,_--date/__driver__.lua"
#  from [f200b00f644b99736ced56bc7237099ebcb704f4]
#    to [32996584305ed55d69e88dd14f0570e6da40b827]
# 
# patch "tests/log_--brief/__driver__.lua"
#  from [a32dba1a7d96655603759e0d5fe75ce0d36e88e9]
#    to [5fe08b4182a0dd9349743363da14eb0c4582fcea]
# 
# patch "tests/log_--diffs/__driver__.lua"
#  from [a05f1fac12f8b4714c6709a100b26610577c2a25]
#    to [afd7dc0ac92acbe635da087c82813f29a1f48acd]
# 
# patch "tests/log_--last=N_--next=N/__driver__.lua"
#  from [aa76e4f861e6a73a7c8108796dadb017d3335bb1]
#    to [21b02d0169db170b1debe2d676785155a6d62a6d]
# 
# patch "tests/log_--last=N_FILENAME/__driver__.lua"
#  from [b339d128b32b27cf104b7016ab1372a7bbe974d6]
#    to [0a1303520e6371358fd057f619e54abb3952086d]
# 
# patch "tests/log_--no-files_and_--merges/__driver__.lua"
#  from [97e503a87b53611a14dd7c89eb909da313471588]
#    to [1a7944f904399553b56f8f4cc69b22152d03b851]
# 
# patch "tests/log_dir/__driver__.lua"
#  from [36ad41079e722c42c45f34e6643799c2cc7ca751]
#    to [a3a018269f3258a93e03b7640d062c79234fb14e]
# 
# patch "tests/log_hides_deleted_renamed_files/__driver__.lua"
#  from [14a29242a685d0d0a151f7abafcfc074fad678b3]
#    to [552e127f6f14474295e744bc045c560e32190daf]
# 
# patch "tests/log_with_restriction/__driver__.lua"
#  from [0d050d3d3234c7499c71b10aeae8c4e49f8292c8]
#    to [0b049235864e9f6687f478d58e0d54d83fc82e57]
# 
# patch "tests/merge_into_workspace/__driver__.lua"
#  from [b93febaa340d15cdc537090dd1b9411f5946e58e]
#    to [e19963a7f4d2b600b7c668fab856b4328c654ea3]
# 
============================================================
--- tests/_--author,_--date/__driver__.lua	f200b00f644b99736ced56bc7237099ebcb704f4
+++ tests/_--author,_--date/__driver__.lua	32996584305ed55d69e88dd14f0570e6da40b827
@@ -6,8 +6,8 @@ check(mtn("log", "--from", rev), 0, true
 rev = base_revision()
 check(mtn("log", "--from", rev), 0, true, false)
 
-check(qgrep('^[\| ]+Author: the_author', "stdout"))
-check(qgrep('^[\| ]+Date: 1999-12-31T12:00:00', "stdout"))
+check(qgrep('^[\\| ]+Author: the_author', "stdout"))
+check(qgrep('^[\\| ]+Date: 1999-12-31T12:00:00', "stdout"))
 
 writefile("testfile", "oovel")
 check(mtn("commit", "--date=1999-12-31T12:00foo", "--branch=foo", "--message=foo"), 1, false, false)
============================================================
--- tests/log_--brief/__driver__.lua	a32dba1a7d96655603759e0d5fe75ce0d36e88e9
+++ tests/log_--brief/__driver__.lua	5fe08b4182a0dd9349743363da14eb0c4582fcea
@@ -13,7 +13,7 @@ R2=base_revision()
 check(mtn("commit", "-b", "otherbranch", "--date", "2005-08-16T03:16:05", "-m", "foo"), 0, false, false)
 R2=base_revision()
 
-check(mtn("log", "--brief"), 0, true, false)
+check(mtn("log", "--brief", "--no-graph"), 0, true, false)
 check(samelines("stdout", {R2.." address@hidden 2005-08-16T03:16:05 otherbranch",
                            R1.." address@hidden 2005-08-16T03:16:00 testbranch",
                            R0.." address@hidden 2005-08-16T03:16:00 testbranch"}))
============================================================
--- tests/log_--diffs/__driver__.lua	a05f1fac12f8b4714c6709a100b26610577c2a25
+++ tests/log_--diffs/__driver__.lua	afd7dc0ac92acbe635da087c82813f29a1f48acd
@@ -26,7 +26,7 @@ REV4=base_revision()
 REV4=base_revision()
 
 -- without restrictions
-check(mtn("log", "--diffs"), 0, true, false)
+check(mtn("log", "--diffs", "--no-graph"), 0, true, false)
 check(grep('^(---|\\+\\+\\+) ', "stdout"), 0, true, false)
 rename("stdout", "full")
 check(get("expect_full"))
@@ -34,7 +34,7 @@ check(samefile("expect_full", "full"))
 check(samefile("expect_full", "full"))
 
 -- restrict to foo2 and quux
-check(mtn("log", "quux", "--diffs", "foo2"), 0, true, false)
+check(mtn("log", "--no-graph", "quux", "--diffs", "foo2"), 0, true, false)
 check(grep("^(---|\\+\\+\\+) ", "stdout"), 0, true, false)
 rename("stdout", "restrict")
 check(get("expect_restrict"))
============================================================
--- tests/log_--last=N_--next=N/__driver__.lua	aa76e4f861e6a73a7c8108796dadb017d3335bb1
+++ tests/log_--last=N_--next=N/__driver__.lua	21b02d0169db170b1debe2d676785155a6d62a6d
@@ -16,7 +16,7 @@ for i = 1,3 do
 
 for i = 1,3 do
   check(mtn("log", "--last="..i), 0, true)
-  check(grep("^Revision:", "stdout"), 0, true)
+  check(grep("^[\\|\\\\\/ ]+Revision:", "stdout"), 0, true)
   check(numlines("stdout") == i)
 end
 
@@ -27,6 +27,6 @@ for i = 1,3 do
 
 for i = 1,3 do
   check(mtn("log", "--next="..i), 0, true)
-  check(grep("^Revision:", "stdout"), 0, true)
+  check(grep("^[\\|\\\\\/ ]+Revision:", "stdout"), 0, true)
   check(numlines("stdout") == i)
 end
============================================================
--- tests/log_--last=N_FILENAME/__driver__.lua	b339d128b32b27cf104b7016ab1372a7bbe974d6
+++ tests/log_--last=N_FILENAME/__driver__.lua	0a1303520e6371358fd057f619e54abb3952086d
@@ -11,5 +11,5 @@ check(mtn("log", "--last=1", "foo"), 0, 
 commit("testbranch", "Addition of baz.")
 
 check(mtn("log", "--last=1", "foo"), 0, true, false)
-check(grep("^Revision:", "stdout"), 0, true, false)
+check(grep("^[\\| ]+Revision:", "stdout"), 0, true, false)
 check(numlines("stdout") == 1)
============================================================
--- tests/log_--no-files_and_--merges/__driver__.lua	97e503a87b53611a14dd7c89eb909da313471588
+++ tests/log_--no-files_and_--merges/__driver__.lua	1a7944f904399553b56f8f4cc69b22152d03b851
@@ -29,8 +29,8 @@ check(mtn("log"), 0, true, false)
 
 -- check that merge is included by default
 check(mtn("log"), 0, true, false)
-check(qgrep("^Revision.*"..R2, "stdout"))
+check(qgrep("^[\\|\\\\\/ ]+Revision.*"..R2, "stdout"))
 
 -- and that it is excluded by --no-merges
 check(mtn("log", "--no-merges"), 0, true, false)
+check(not qgrep("^[\\|\\\\\/ ]+Revision.*"..R2, "stdout"))
-check(not qgrep("^Revision.*"..R2, "stdout"))
============================================================
--- tests/log_dir/__driver__.lua	36ad41079e722c42c45f34e6643799c2cc7ca751
+++ tests/log_dir/__driver__.lua	a3a018269f3258a93e03b7640d062c79234fb14e
@@ -53,6 +53,6 @@ for n,x in pairs{[""]  = {0,0,0,0,0,0,0}
   end
   for i,v in pairs(x) do
     L("Checking log of '", n, "' for revision ", i, "\n")
-    check((v == 0) == qgrep("^Revision: "..revs[i], "stdout"))
+    check((v == 0) == qgrep("^[\\|\\\\\/ ]+Revision: "..revs[i], "stdout"))
   end
 end
============================================================
--- tests/log_hides_deleted_renamed_files/__driver__.lua	14a29242a685d0d0a151f7abafcfc074fad678b3
+++ tests/log_hides_deleted_renamed_files/__driver__.lua	552e127f6f14474295e744bc045c560e32190daf
@@ -26,7 +26,7 @@ check(mtn("log", "baz"), 1, 0, false)
 
 check(mtn("log", "baz"), 1, 0, false)
 
-check(mtn("log", "bar"), 0, true, false)
+check(mtn("log", "--no-graph", "bar"), 0, true, false)
 rename("stdout", "log")
 check(grep("^Addition of [a-z][a-z][a-z].$", "log"), 0, true)
 check(get("first"))
@@ -34,7 +34,7 @@ check(samefile("stdout", "first"))
 canonicalize("stdout")
 check(samefile("stdout", "first"))
 
-check(mtn("log"), 0, true, false)
+check(mtn("log", "--no-graph"), 0, true, false)
 rename("stdout", "log")
 check(grep("^Addition of [a-z][a-z][a-z].$", "log"), 0, true)
 check(get("second"))
============================================================
--- tests/log_with_restriction/__driver__.lua	0d050d3d3234c7499c71b10aeae8c4e49f8292c8
+++ tests/log_with_restriction/__driver__.lua	0b049235864e9f6687f478d58e0d54d83fc82e57
@@ -28,10 +28,10 @@ rename("stdout", "log")
 check(mtn("log", "foo"), 0, true, false)
 rename("stdout", "log")
 
-check(grep("^Revision:", "log"), 0, true, false)
+check(grep("^[\\|\\\\\/ ]+Revision:", "log"), 0, true, false)
 rename("stdout", "revs")
 check(numlines("revs") == 3)
 
+check(grep("^[\\|\\\\\/ ]+Revision: " .. rev_foo1, "log"), 0, true)
+check(grep("^[\\|\\\\\/ ]+Revision: " .. rev_foo2, "log"), 0, true)
+check(grep("^[\\|\\\\\/ ]+Revision: " .. rev_foo3, "log"), 0, true)
-check(grep("^Revision: " .. rev_foo1, "log"), 0, true)
-check(grep("^Revision: " .. rev_foo2, "log"), 0, true)
-check(grep("^Revision: " .. rev_foo3, "log"), 0, true)
============================================================
--- tests/merge_into_workspace/__driver__.lua	b93febaa340d15cdc537090dd1b9411f5946e58e
+++ tests/merge_into_workspace/__driver__.lua	e19963a7f4d2b600b7c668fab856b4328c654ea3
@@ -83,10 +83,10 @@ check(get("expected-log-left"))
 check(get("expected-log"))
 check(get("expected-log-left"))
 
-check(mtn("log", "testfile"), 0, true, nil)
+check(mtn("log", "--no-graph", "testfile"), 0, true, nil)
 check(samefile_ignore_dates("stdout", "expected-log"))
 
-check(mtn("log", "--from", left), 0, true, nil)
+check(mtn("log", "--no-graph", "--from", left), 0, true, nil)
 check(samefile_ignore_dates("stdout", "expected-log-left"))
 
 -- a commit at this point should succeed