Changes 0 to 10 on this branch are displayed below, sorted in descending chronological order.

2372 days ago: propagate from branch 'net.venge.monotone' (head 9e27b9f86c90c651bf661acb035a374553c9d7b1)
revision info | browse files | diff, diff
Author: Richard Hopkins <richhguard-monotone@yahoo.co.uk>
Changelog: propagate from branch 'net.venge.monotone' (head 9e27b9f86c90c651bf661acb035a374553c9d7b1)
to branch 'net.venge.monotone.issue-76' (head 179f2eb95ee8c2a8c32fb161c4faf1d7d8b1daf6)
Date: Tue, 29 Mar 2011 15:17:06 GMT
2372 days ago: Extra checks for revert_in_two_parent_workspace
revision info | browse files | diff
Author: Richard Hopkins <richhguard-monotone@yahoo.co.uk>
Changelog: Extra checks for revert_in_two_parent_workspace
We now check stdout to make sure only the files we expect have been
reverting, as well as check the contents afterwards.
In addition, we check which revision the workspace should now be based off
and if there no changes. The base revision should be the one we reverted
to, and there should be no changes. This currently fails on line 50, with
the base revision check. I do not know why yet, as it seems to think the
base revision is "right", instead of "left".
Performing the same sequence of steps manually in a different terminal
session, all works correctly and the base revision is "left".
Date: Tue, 29 Mar 2011 14:35:10 GMT
2372 days ago: Changed more qgrep's to samelines - after the merge_into_workspace.
revision info | browse files | diff
Author: Richard Hopkins <richhguard-monotone@yahoo.co.uk>
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.
Date: Tue, 29 Mar 2011 09:10:44 GMT
2372 days ago: Removed TODO's in revert_in_two_parent_workspace test about checking file
revision info | browse files | diff
Author: Richard Hopkins <richhguard-monotone@yahoo.co.uk>
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.
Date: Tue, 29 Mar 2011 08:59:06 GMT
2374 days ago: Created new revert_in_two_parent_workspace func test
revision info | browse files | diff
Author: Richard Hopkins <richhguard-monotone@yahoo.co.uk>
Changelog: Created new revert_in_two_parent_workspace func test
Moved the existing revert test from two_parent_workspace_commands_that_fail
into it, and also copied the setup/writefile/commit template to produce a
workspace with 2 parents.
All the tests currently pass, however the new test is not yet finished so
I've left some TODO's in it for the meantime. The bottom section of
commented out code should be correct as it checks the workspace contents
after a revert to "right" - it just depends on the unimplemented revert to
"right" code.
Also, the code which checks the contents of the files should really be
"left\nancestor", but I couldn't get it to work by using \n in the string.
As a work around I check for both left + ancestor, and check for NOT right.
Date: Sun, 27 Mar 2011 10:06:33 GMT
2375 days ago: Revert can now be used in a multi-parent workspace
revision info | browse files | diff
Author: Richard Hopkins <richhguard-monotone@yahoo.co.uk>
Changelog: Revert can now be used in a multi-parent workspace
cmd_ws_commit.cc (revert): A revision can now be specified manually and it
will be used to calculate old_roster - if it's a valid parent of the
workspace.
func/two_parent_workspace_commands_that_fail/__driver__.lua: Updated
expected message when reverting in a multi-parent workspace without
specifying the revision.
All tests now pass.
TODO: Need to add some more tests for revert such as passing in a
non-parent revision id, and checking the file reverted file contents
are the correct ones.
Date: Sat, 26 Mar 2011 14:27:17 GMT
(no earlier changes) recent changes (no later changes)