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

[code]

revision:            d9b957a9e129d508969566109bebce4cc577e727
date:                2011-03-29T08:59:06
author:              Richard Hopkins <address@hidden>
branch:              net.venge.monotone.issue-76
changelog:
Removed TODO's in revert_in_two_parent_workspace test about checking file
contents after revert

Now uses the samelines function to explicitly test the file contents
instead of using qgrep. The tests still pass.

manifest:
format_version "1"

new_manifest [fb8274f2acb6608a1f9bc545187d2b9d3e779b1d]

old_revision [3a61386f52e480fb4f4ed872c17c9d4e0460bef5]

patch "test/func/revert_in_two_parent_workspace/__driver__.lua"
 from [d040c7e5badcbe9a246b3d1a64790f1c3c47b269]
   to [143b401a32c46e2461b2af82344dc340b7248598]
============================================================
--- test/func/revert_in_two_parent_workspace/__driver__.lua	d040c7e5badcbe9a246b3d1a64790f1c3c47b269
+++ test/func/revert_in_two_parent_workspace/__driver__.lua	143b401a32c46e2461b2af82344dc340b7248598
@@ -42,13 +42,9 @@ check(mtn("revert", ".", "-r", left), 0,
 -- now lets revert back to a proper revision - and check the workspace
 -- contents
 check(mtn("revert", ".", "-r", left), 0, nil, true)
--- TODO: don't know how to check for left\nancestor
-check(qgrep("left", "testfile"))
-check(qgrep("ancestor", "testfile"))
-check(not qgrep("right", "testfile"))
+check(samelines("testfile", { "left", "ancestor" } ))
+check(samelines("otherfile", { "modified too" } ))
 
-check(qgrep("modified too", "otherfile"))
-
 -- TODO: file contents are fine - now lets check if the book keeping is
 -- correct by running "mtn status" and "mtn ls changed" - there should
 -- be no changes
@@ -56,10 +52,6 @@ check(qgrep("modified too", "otherfile")
 
 
 -- TODO: perform revert to right as well
--- TODO: check for ancestor\nancestor
---check(qgrep("ancestor", "testfile"))
---check(not qgrep("left", "testfile"))
---check(not qgrep("right", "testfile"))
+-- check(samelines("testfile", { "ancestor", "right" } )
+-- check(samelines("otherfile", { "blah blah" } )
 
---check(qgrep("blah blah", "otherfile"))
-