[Monotone-commits-diffs] Revision 5384966dc37f50f4feae26084d00bacda0019a02

[monotone]

-----------------------------------------------------------------
Revision: 5384966dc37f50f4feae26084d00bacda0019a02
Ancestor: ae9bb0882960e2a9b8ac135ed1b25b809c9073fb
Author: address@hidden
Date: 2007-02-10T23:17:36
Branch: net.venge.monotone.editable_tree.checkout

Modified files:
        cmd.hh cmd_merging.cc cmd_ws_commit.cc commands.cc
        tests/checkout_does_not_clobber_workspace/__driver__.lua
        tests/delete_work_file_on_checkout/__driver__.lua
        tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua
        tests/multiple_version_committing/__driver__.lua
        tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua
        tests/selecting_arbitrary_certs/__driver__.lua
        tests/test_annotate_command/__driver__.lua testsuite.lua
        work.cc work.hh

ChangeLog: 

        * cmd.hh (get_content_paths): add prototype
        * cmd_merging.cc (get_content_paths): remove from here
        * cmd_ws_commit.cc (checkout): add content path map to checkout
        * commands.cc (get_content_paths): move to here

        * tests/checkout_does_not_clobber_workspace/__driver.lua__:
        un-xfail clobber checks
        * tests/delete_work_file_on_checkout/__driver.lua__:
        * tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua:
        * tests/persisten_netsync_server_-_reves_&_certs/__driver__.lua:
        * tests/selecting_arbitrary_certs/__driver__.lua:
        remove blocking workspace files
        * tests/multiple_version_committing/__driver__.lua:
        * tests/test_annotate_command/__driver__.lua:
        replace explicit checkouts with calls to revert_to

        * testsuite.lua (revert_to): remove all files known in the target
        revision from the workspace prior to running checkout 
        * work.{cc,hh} (workspace_itemizer): move addition of root node
        into constructor
        (editable_working_tree): add flag to control message output to
        maintain silence from checkout
        (editable_working_tree::attach_node): use flag to control message 
        output
        (simulated_working_tree::attach_node): add special case check for
        previously attached root node to make checkout happy
        (workspace::perform_content_update): add boolean arg to control
        message output; remove attachment of root node

txtsbe7QgBGUM.txt
Description: Diff [ae9bb0882960e2a9b8ac135ed1b25b809c9073fb] -> [5384966dc37f50f4feae26084d00bacda0019a02]