[Monotone-commits-diffs] Revision 4b971a0869733b24d0a0d5df32b1f92f216c6192

[monotone]

-----------------------------------------------------------------
Revision: 4b971a0869733b24d0a0d5df32b1f92f216c6192
Ancestor: 79fa2186402fcd15180ab24a42bff212abd114d9
Ancestor: ba5f9955eefbf9fd54826e233c5ae63343e6951d
Author: address@hidden
Date: 2007-02-28T11:06:30
Branch: net.venge.monotone

Added files:
        tests/automate_put_revision_for_merge/__driver__.lua
Added directories:
        tests/automate_put_revision_for_merge
Modified files:
        automate.cc cmd_diff_log.cc cmd_ws_commit.cc database.cc
        file_io.cc file_io.hh monotone.texi options_list.hh
        revision.cc tester.cc
        tests/(imp)_deleting_directories/__driver__.lua
        tests/(imp)_merge((patch_foo_a),_(delete_foo_))/__driver__.lua
        tests/(minor)_drop_in_subdir/__driver__.lua
        tests/(minor)_update_cleans_emptied_directories/__driver__.lua
        tests/_MTN_revision_is_required/__driver__.lua
        tests/add_unknown_recursive/__driver__.lua
        tests/add_unknown_recursive_ignored/__driver__.lua
        tests/annotate_file_whose_name_changed/__driver__.lua
        tests/automate_cert/__driver__.lua
        tests/automate_get_corresponding_path/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/automate_put_file/__driver__.lua
        tests/automate_put_revision/__driver__.lua
        tests/automate_put_revision_unknown_file/__driver__.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/diff_shows_renames/__driver__.lua
        tests/drop_directory_with_unversioned_files_and_update/__driver__.lua
        tests/drop_missing_and_unknown_files/__driver__.lua
        tests/drop_removes_attributes/__driver__.lua
        tests/drop_with_actual_removal/__driver__.lua
        tests/empty_string_as_a_path_name/__driver__.lua
        tests/fetching_nonexistent_entry_from_children_bug/__driver__.lua
        tests/filenames_in_diff_after_rename/__driver__.lua
        tests/files_with_intermediate__MTN_path_elements/__driver__.lua
        tests/importing_files_with_non-english_names/__driver__.lua
        tests/list_missing_files/__driver__.lua
        tests/listing_changed_files/__driver__.lua
        tests/listing_workspace_manifests/__driver__.lua
        tests/log_--diffs/__driver__.lua
        tests/log_hides_deleted_renamed_files/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/manifest_restrictions/__driver__.lua
        tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((),_(drop_a,_rename_b_a,_patch_a))/__driver__.lua
        tests/merge((),_(patch_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((add_a),_(add_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((drop_a),_(drop_a,_add_a))/__driver__.lua
        tests/merge((drop_a),_(rename_a_b,_patch_b))/__driver__.lua
        tests/merge((patch_a),_(drop_a,_add_a))/__driver__.lua
        tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua
        tests/merge((rename_a_b),_(rename_a_c))/__driver__.lua
        tests/merge_into_workspace/__driver__.lua
        tests/merge_rename_file_and_rename_dir/__driver__.lua
        tests/merge_with_add,_rename_file,_and_rename_dir/__driver__.lua
        tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua
        tests/merging_(add_a,_rename_a_b)_with_(add_b)/__driver__.lua
        tests/merging_a_rename_twice/__driver__.lua
        tests/no-change_deltas_disappear/__driver__.lua
        tests/pivot_root/__driver__.lua
        tests/pivot_root_to_new_dir/__driver__.lua
        tests/pluck_basics/__driver__.lua
        tests/pluck_lifecycle/__driver__.lua
        tests/rename_cannot_overwrite_files/__driver__.lua
        tests/rename_dir_to_non-sibling/__driver__.lua
        tests/rename_file_to_dir/__driver__.lua
        tests/rename_files_into_a_directory/__driver__.lua
        tests/rename_in_new_workspace/__driver__.lua
        tests/rename_in_subdir/__driver__.lua
        tests/rename_moves_attributes/__driver__.lua
        tests/rename_with_actual_file_rename/__driver__.lua
        tests/renaming_a_deleted_file/__driver__.lua
        tests/renaming_a_directory/__driver__.lua
        
tests/renaming_a_directory_and_then_adding_a_new_with_the_old_name/__driver__.lua
        tests/renaming_a_file/__driver__.lua
        tests/renaming_a_patched_file/__driver__.lua
        tests/renaming_and_editing_a_file/__driver__.lua
        tests/restricted_commands_are_consistent/__driver__.lua
        tests/restrictions_with_deletes/__driver__.lua
        tests/restrictions_with_renames_and_adds/__driver__.lua
        tests/revert_file_blocked_by_unversioned_directory/__driver__.lua
        tests/revert_file_to_base_revision/__driver__.lua
        tests/revert_moving_a_file_to_a_renamed_directory/__driver__.lua
        tests/revert_renames/__driver__.lua
        tests/revert_the_middle_of_a_sequence/__driver__.lua
        tests/reverting_a_pivot_root/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        tests/show_conflicts/__driver__.lua
        tests/single_character_filename_support/__driver__.lua
        tests/spawn_pipe/__driver__.lua tests/status/__driver__.lua
        tests/test_annotate_command/__driver__.lua
        tests/two_parent_workspace_add_drop_rename/__driver__.lua
        tests/two_parent_workspace_list/__driver__.lua
        tests/two_parent_workspace_pivot_root/__driver__.lua
        tests/update_with_blocked_rename/__driver__.lua
        tests/update_with_pending_drop/__driver__.lua
        tests/update_with_pending_rename/__driver__.lua
        tests/updating_through_a_pivot_root/__driver__.lua
        tests/workspace_migration/basic.lua
        tests/workspace_migration/inodeprints.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua work.cc
        work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.default-execute' (head 
79fa2186402fcd15180ab24a42bff212abd114d9)
            to branch 'net.venge.monotone' (head 
ba5f9955eefbf9fd54826e233c5ae63343e6951d)


monotone --db={your.database} diff 
--revision=79fa2186402fcd15180ab24a42bff212abd114d9 
--revision=4b971a0869733b24d0a0d5df32b1f92f216c6192
monotone --db={your.database} diff 
--revision=ba5f9955eefbf9fd54826e233c5ae63343e6951d 
--revision=4b971a0869733b24d0a0d5df32b1f92f216c6192
----------------------------------------------------------------------