[Monotone-commits-diffs] net.venge.monotone.issue-76: 0feba3db0538bac41baca2edaaeb0a0193a6c13e

[code]

revision:            0feba3db0538bac41baca2edaaeb0a0193a6c13e
date:                2011-03-29T09:10:44
author:              Richard Hopkins <address@hidden>
branch:              net.venge.monotone.issue-76
changelog:
Changed more qgrep's to samelines - after the merge_into_workspace.

These are changed in the new revert_in_two_parent_workspace tests and the
original two_parent_workspace_commands_that_fail test it came from. Both
tests pass.

manifest:
format_version "1"

new_manifest [5598c0f50032b5b83d9e97c591c55d7bd5e0ca3f]

old_revision [d9b957a9e129d508969566109bebce4cc577e727]

patch "test/func/revert_in_two_parent_workspace/__driver__.lua"
 from [143b401a32c46e2461b2af82344dc340b7248598]
   to [08bd4f51be1973fa6d9ba03cda93b099a5598fd0]

patch "test/func/two_parent_workspace_commands_that_fail/__driver__.lua"
 from [62dc5459a99ca751ce021a47b7f3769b3f567b37]
   to [38dd3e02856cfdad3f23a34ad21d284a35664706]
============================================================
--- test/func/two_parent_workspace_commands_that_fail/__driver__.lua	62dc5459a99ca751ce021a47b7f3769b3f567b37
+++ test/func/two_parent_workspace_commands_that_fail/__driver__.lua	38dd3e02856cfdad3f23a34ad21d284a35664706
@@ -21,9 +21,8 @@ check(mtn("merge_into_workspace", left),
 right = base_revision()
 
 check(mtn("merge_into_workspace", left), 0, false, false)
-check(qgrep("left", "testfile"))
-check(qgrep("right", "testfile"))
-check(not qgrep("ancestor", "testfile"))
+check(samelines("testfile", { "left", "right" } ))
+check(samelines("otherfile", { "modified too" } ))
 
 diag = "mtn: misuse: this command can only be used in a single-parent workspace\n"
 diffdiag = ("mtn: misuse: this workspace has more than one parent\n"..
============================================================
--- test/func/revert_in_two_parent_workspace/__driver__.lua	143b401a32c46e2461b2af82344dc340b7248598
+++ test/func/revert_in_two_parent_workspace/__driver__.lua	08bd4f51be1973fa6d9ba03cda93b099a5598fd0
@@ -19,9 +19,8 @@ check(mtn("merge_into_workspace", left),
 right = base_revision()
 
 check(mtn("merge_into_workspace", left), 0, false, false)
-check(qgrep("left", "testfile"))
-check(qgrep("right", "testfile"))
-check(not qgrep("ancestor", "testfile"))
+check(samelines("testfile", { "left", "right" } ))
+check(samelines("otherfile", { "modified too" } ))
 
 -- we now have workspace with 2 parents, so lets try a revert
 -- without specifying a revision - mtn should throw an error