[Monotone-commits-nodiffs] Revision f52e6d53d1bbb11270d048e500a401a0d7c4ec85

[monotone]

-----------------------------------------------------------------
Revision: f52e6d53d1bbb11270d048e500a401a0d7c4ec85
Ancestor: 809c95ffd7c132e2987cabb3d2f0c29dd161ff89
Ancestor: ba5e854a9fe16d0616eff0095c782fa82af4ec41
Author: Timothy Brownawell  <address@hidden>
Date: 2006-06-04T04:53:28
Branch: net.venge.monotone.lua-testsuite

Deleted entries:
        tests/t_add_intermediate__MTN_path.at
        tests/t_approval_semantics.at tests/t_automate_heads.at
        tests/t_automate_version.at tests/t_branch_checkout.at
        tests/t_cdiff.at tests/t_change_empty_file.at
        tests/t_checkout_noop_on_fail.at tests/t_db_missing.at
        tests/t_delete_dir_patch.at tests/t_i18n_changelog.at
        tests/t_largish_file.at tests/t_load_into_existing.at
        tests/t_merge_3.at tests/t_merge_4.at
        tests/t_merge_normalization_edge_case.at
        tests/t_monotone_agent.at tests/t_need_mt_revision.at
        tests/t_no_rename_overwrite.at
        tests/t_restrictions_warn_on_unknown.at
        tests/t_revert_dirs.at tests/t_revert_rename.at
        tests/t_revert_unchanged.at tests/t_undo_update.at
        tests/t_update_null_revision.at
Added files:
        tests/(imp)_merge((patch_foo_a),_(delete_foo_))/__driver__.lua
        tests/(minor)_context_diff/__driver__.lua
        tests/(minor)_test_a_merge_3/__driver__.lua
        tests/(minor)_test_a_merge_3/ancestor
        tests/(minor)_test_a_merge_3/left
        tests/(minor)_test_a_merge_3/merge.diff3
        tests/(minor)_test_a_merge_3/right
        tests/(minor)_test_a_merge_4/__driver__.lua
        tests/(minor)_test_a_merge_4/ancestor
        tests/(minor)_test_a_merge_4/left
        tests/(minor)_test_a_merge_4/merge.diff3
        tests/(minor)_test_a_merge_4/right
        tests/(todo)_design_approval_semantics/__driver__.lua
        tests/(todo)_undo_update_command/__driver__.lua
        tests/(todo)_write_monotone-agent/__driver__.lua
        tests/_MTN_revision_is_required/__driver__.lua
        tests/automate_automate_version/__driver__.lua
        tests/automate_heads/__driver__.lua
        tests/branch-based_checkout/__driver__.lua
        tests/committing_with_a_non-english_message/__driver__.lua
        tests/db_load_must_create_a_new_db/__driver__.lua
        tests/db_missing/__driver__.lua
        tests/failed_checkout_is_a_no-op/__driver__.lua
        tests/files_with_intermediate__MTN_path_elements/__driver__.lua
        tests/largish_file/__driver__.lua
        tests/merge_normalization_edge_case/__driver__.lua
        tests/merge_normalization_edge_case/left
        tests/merge_normalization_edge_case/parent
        tests/merge_normalization_edge_case/right
        tests/modification_of_an_empty_file/__driver__.lua
        tests/rename_cannot_overwrite_files/__driver__.lua
        tests/revert_directories/__driver__.lua
        tests/revert_renames/__driver__.lua
        tests/revert_unchanged_file_preserves_mtime/__driver__.lua
        tests/update_no-ops_when_no_parent_revision/__driver__.lua
        tests/warn_on_bad_restriction/__driver__.lua
Added directories:
        tests/(imp)_merge((patch_foo_a),_(delete_foo_))
        tests/(minor)_context_diff tests/(minor)_test_a_merge_3
        tests/(minor)_test_a_merge_4
        tests/(todo)_design_approval_semantics
        tests/(todo)_undo_update_command
        tests/(todo)_write_monotone-agent
        tests/_MTN_revision_is_required
        tests/automate_automate_version tests/automate_heads
        tests/branch-based_checkout
        tests/committing_with_a_non-english_message
        tests/db_load_must_create_a_new_db tests/db_missing
        tests/failed_checkout_is_a_no-op
        tests/files_with_intermediate__MTN_path_elements
        tests/largish_file tests/merge_normalization_edge_case
        tests/modification_of_an_empty_file
        tests/rename_cannot_overwrite_files tests/revert_directories
        tests/revert_renames
        tests/revert_unchanged_file_preserves_mtime
        tests/update_no-ops_when_no_parent_revision
        tests/warn_on_bad_restriction
Modified files:
        ChangeLog adler32.hh annotate.cc annotate.hh app_state.cc
        app_state.hh automate.cc basic_io.cc basic_io.hh cert.cc
        cert.hh charset.cc charset.hh cleanup.hh cmd.hh
        cmd_automate.cc cmd_db.cc cmd_diff_log.cc cmd_files.cc
        cmd_key_cert.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
        cmd_othervcs.cc cmd_packet.cc cmd_ws_commit.cc commands.cc
        commands.hh constants.cc constants.hh crypto_tests.cc
        cset.cc cset.hh cycle_detector.hh database.cc database.hh
        database_check.cc database_check.hh diff_patch.cc
        diff_patch.hh enumerator.cc enumerator.hh epoch.cc epoch.hh
        file_io.cc file_io.hh globish.cc globish.hh hash_map.hh
        hmac.cc hmac.hh inodeprint.cc inodeprint.hh interner.hh
        key_store.cc key_store.hh keys.cc keys.hh lcs.cc lcs.hh
        legacy.cc legacy.hh localized_file_io.cc
        localized_file_io.hh lua.cc lua.hh lua_hooks.cc lua_hooks.hh
        main.cc merge.cc merge.hh merkle_tree.cc merkle_tree.hh
        mkstemp.cc monotone.cc mt_version.cc mt_version.hh netcmd.cc
        netcmd.hh netio.hh netsync.cc netsync.hh netxx_pipe.cc
        netxx_pipe.hh numeric_vocab.hh options.hh packet.cc
        packet.hh parallel_iter.hh paths.cc paths.hh platform.hh
        po/it.po po/sv.po quick_alloc.hh randomfile.hh rcs_file.cc
        rcs_file.hh rcs_import.cc rcs_import.hh refiner.cc
        refiner.hh restrictions.cc restrictions.hh revision.cc
        revision.hh roster.cc roster.hh roster_merge.cc
        roster_merge.hh safe_map.hh sanity.cc sanity.hh
        schema_migration.cc schema_migration.hh selectors.cc
        selectors.hh simplestring_xform.cc simplestring_xform.hh
        smap.hh std_hooks.lua string_queue.hh tester.cc tester.lua
        tests/calculation_of_unidiffs/__driver__.lua
        tests/checkout_validates_target_directory/__driver__.lua
        tests/importing_CVS_files/__driver__.lua
        tests/importing_a_CVS_file_with_one_version/__driver__.lua
        testsuite.at testsuite.lua transforms.cc transforms.hh
        txt2c.cc ui.cc ui.hh unit_tests.cc unit_tests.hh update.cc
        update.hh uri.cc uri.hh vocab.cc vocab.hh vocab_terms.hh
        win32/os_strerror.cc work.cc work.hh xdelta.cc xdelta.hh

ChangeLog: 

merge of 809c95ffd7c132e2987cabb3d2f0c29dd161ff89
     and ba5e854a9fe16d0616eff0095c782fa82af4ec41


monotone --db={your.database} diff 
--revision=809c95ffd7c132e2987cabb3d2f0c29dd161ff89 
--revision=f52e6d53d1bbb11270d048e500a401a0d7c4ec85
monotone --db={your.database} diff 
--revision=ba5e854a9fe16d0616eff0095c782fa82af4ec41 
--revision=f52e6d53d1bbb11270d048e500a401a0d7c4ec85
----------------------------------------------------------------------