[Monotone-commits-diffs] Revision 9cdfac19850e390a470703aa32762ce2ecedd2ff

[monotone]

-----------------------------------------------------------------
Revision: 9cdfac19850e390a470703aa32762ce2ecedd2ff
Ancestor: 8701ff02a2d7e301426491ce9ff5d09bea088d7e
Ancestor: 886d00a603ce195a8674087cc91b53736a4a3ca1
Author: address@hidden
Date: 2009-10-24T09:38:05
Branch: net.venge.monotone.cvssync.refactor

Deleted entries:
        tests/common/automate_ancestry.lua
        tests/common/netsync-hooks.lua
        tests/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua tests/common/selectors.lua
        tests/netsync_stops_on_key_id_clash
        tests/netsync_stops_on_key_id_clash/__driver__.lua
        tests/spawn_redirected_hook_helper
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/spawn_redirected_hook_helper/testhooks
Added files:
        automate_ostream.hh automate_ostream_demuxed.hh
        automate_reader.cc automate_reader.hh mtn_cvs/.cproject
        mtn_cvs/.project mtn_cvs/CVS_prot mtn_cvs/Makefile.am
        mtn_cvs/TODO mtn_cvs/cvs_client.cc mtn_cvs/cvs_client.hh
        mtn_cvs/cvs_edge.cc mtn_cvs/cvs_revision_nr.cc
        mtn_cvs/cvs_sync.cc mtn_cvs/cvs_sync.hh
        mtn_cvs/cvs_sync_pull.cc mtn_cvs/cvs_sync_push.cc
        mtn_cvs/cvs_sync_takeover.cc mtn_cvs/lua-testsuite.lua
        mtn_cvs/mtn_automate.cc mtn_cvs/mtn_automate.hh
        mtn_cvs/mtn_cvs.cc mtn_cvs/mtn_pipe.cc mtn_cvs/mtn_pipe.hh
        mtn_cvs/mtncvs_state.cc mtn_cvs/mtncvs_state.hh
        mtn_cvs/old_tests/cleanup mtn_cvs/old_tests/cvs_test_setup
        mtn_cvs/old_tests/cvs_test_setup2
        mtn_cvs/old_tests/cvs_test_setup3
        mtn_cvs/old_tests/cvs_test_setup4
        mtn_cvs/old_tests/cvs_test_setup5 mtn_cvs/old_tests/db_setup
        mtn_cvs/old_tests/db_setup2 mtn_cvs/old_tests/settings
        mtn_cvs/old_tests/show_disk_usage
        mtn_cvs/old_tests/t_cvspull_combined.at
        mtn_cvs/old_tests/t_cvspull_committemplate.at
        mtn_cvs/old_tests/t_cvspull_cvsbranch.at
        mtn_cvs/old_tests/t_cvspull_md5fail.at
        mtn_cvs/old_tests/t_cvspull_rapid.at
        mtn_cvs/old_tests/t_cvspull_samedirname.at
        mtn_cvs/old_tests/t_cvspull_separate.at
        mtn_cvs/old_tests/t_cvspull_xmodule.at
        mtn_cvs/old_tests/t_cvspush_loop.at
        mtn_cvs/old_tests/t_cvstakeover_modified.at
        mtn_cvs/old_tests/test_all mtn_cvs/options.cc
        mtn_cvs/options.hh mtn_cvs/options_list.hh
        mtn_cvs/piece_table.cc mtn_cvs/piece_table.hh
        mtn_cvs/stringtok.hh
        mtn_cvs/tests/common/automate_ancestry.lua
        mtn_cvs/tests/common/cvs.lua
        mtn_cvs/tests/common/netsync-hooks.lua
        mtn_cvs/tests/common/netsync-hooks_with_notes.lua
        mtn_cvs/tests/common/netsync.lua
        mtn_cvs/tests/common/selectors.lua
        mtn_cvs/tests/min_hooks.lua
        mtn_cvs/tests/pull_combined/__driver__.lua
        mtn_cvs/tests/pull_committemplate/__driver__.lua
        mtn_cvs/tests/pull_cvsbranch/__driver__.lua
        mtn_cvs/tests/pull_md5fail/__driver__.lua
        mtn_cvs/tests/pull_md5fail/test/A,v
        mtn_cvs/tests/pull_md5fail/test/B,v
        mtn_cvs/tests/pull_md5fail/test/dir/D,v
        mtn_cvs/tests/pull_rapid/__driver__.lua
        mtn_cvs/tests/pull_samedirname/__driver__.lua
        mtn_cvs/tests/pull_separate/__driver__.lua
        mtn_cvs/tests/pull_xmodule/__driver__.lua
        mtn_cvs/tests/push_add_drop/__driver__.lua
        mtn_cvs/tests/push_loop/__driver__.lua
        mtn_cvs/tests/push_pull_with_changes/__driver__.lua
        mtn_cvs/tests/push_rename/__driver__.lua
        mtn_cvs/tests/push_rename_and_change/__driver__.lua
        mtn_cvs/tests/push_simple/__driver__.lua
        mtn_cvs/tests/takeover_basic/__driver__.lua
        mtn_cvs/tests/takeover_modified/__driver__.lua
        mtn_cvs/tests/test_hooks.lua mtn_cvs/tests/test_keys
        network/automate_session.cc network/automate_session.hh
        network/connection_info.cc network/connection_info.hh
        network/listener.cc network/listener.hh
        network/listener_base.cc network/listener_base.hh
        network/make_server.cc network/make_server.hh
        network/netsync.txt network/netsync_session.cc
        network/netsync_session.hh network/reactable.cc
        network/reactable.hh network/reactor.cc network/reactor.hh
        network/session.cc network/session.hh
        network/session_base.cc network/session_base.hh
        network/wrapped_session.cc network/wrapped_session.hh
        tester-tests/running_commands/__driver__.lua
        tester-tests/running_commands/script
        tests/automate_sync_info/__driver__.lua
        tests/date_formatting/__driver__.lua
        tests/db_fix_certs/__driver__.lua
        tests/db_fix_certs/generate-db.sh
        tests/db_fix_certs/other_key tests/db_fix_certs/test.mtn
        tests/diff_reverse/__driver__.lua
        tests/duplicate_key_id/local_name.lua
        tests/exception-in-luaext/__driver__.lua
        tests/exception-in-luaext/evilrc.lua
        tests/importing_cvs_metadata/__driver__.lua
        tests/importing_cvs_metadata/cvs-repository/test/test.txt,v
        tests/importing_cvs_metadata/expected_log_output
        tests/in_memory_database/__driver__.lua
        tests/move_conflicting_unversioned/__driver__.lua
        tests/netsync_negotiation/__driver__.lua
        tests/netsync_negotiation/netsync6.lua
        tests/resolve_conflicts_all_resolutions/show_first-gui_left
        tests/resolve_conflicts_all_resolutions/show_first-gui_right
        tests/resolve_conflicts_all_resolutions/show_remaining-gui_left
        tests/resolve_conflicts_duplicate_name_directory/__driver__.lua
        tests/resolve_conflicts_orphaned_file/__driver__.lua
        tests/revert_directory_blocked_by_unversioned_directory/__driver__.lua
        tests/revert_directory_blocked_by_unversioned_file/__driver__.lua
        tests/revert_directory_replaced_by_file/__driver__.lua
        tests/revert_file_blocked_by_unversioned_file/__driver__.lua
        tests/revert_file_replaced_by_directory/__driver__.lua
        tests/revert_renamed_directory_replaced_by_file/__driver__.lua
        tests/revert_renamed_file_replaced_by_directory/__driver__.lua
        tests/revert_uncommitted_execute_attr/__driver__.lua
        tests/serve-automate/__driver__.lua
        tests/serve-automate-single-run/__driver__.lua
        tests/skip_invalid_paths/__driver__.lua
        tests/update_loses_execute/__driver__.lua
        tests/w_selector/__driver__.lua
Added directories:
        mtn_cvs mtn_cvs/old_tests mtn_cvs/tests mtn_cvs/tests/common
        mtn_cvs/tests/pull_combined
        mtn_cvs/tests/pull_committemplate
        mtn_cvs/tests/pull_cvsbranch mtn_cvs/tests/pull_md5fail
        mtn_cvs/tests/pull_md5fail/test
        mtn_cvs/tests/pull_md5fail/test/Attic
        mtn_cvs/tests/pull_md5fail/test/dir mtn_cvs/tests/pull_rapid
        mtn_cvs/tests/pull_samedirname mtn_cvs/tests/pull_separate
        mtn_cvs/tests/pull_xmodule mtn_cvs/tests/push_add_drop
        mtn_cvs/tests/push_loop mtn_cvs/tests/push_pull_with_changes
        mtn_cvs/tests/push_rename
        mtn_cvs/tests/push_rename_and_change
        mtn_cvs/tests/push_simple mtn_cvs/tests/takeover_basic
        mtn_cvs/tests/takeover_modified network
        tester-tests/running_commands tests/automate_sync_info
        tests/date_formatting tests/db_fix_certs tests/diff_reverse
        tests/exception-in-luaext tests/importing_cvs_metadata
        tests/importing_cvs_metadata/cvs-repository
        tests/importing_cvs_metadata/cvs-repository/test
        tests/in_memory_database tests/move_conflicting_unversioned
        tests/netsync_negotiation
        tests/resolve_conflicts_duplicate_name_directory
        tests/resolve_conflicts_orphaned_file
        tests/revert_directory_blocked_by_unversioned_directory
        tests/revert_directory_blocked_by_unversioned_file
        tests/revert_directory_replaced_by_file
        tests/revert_file_blocked_by_unversioned_file
        tests/revert_file_replaced_by_directory
        tests/revert_renamed_directory_replaced_by_file
        tests/revert_renamed_file_replaced_by_directory
        tests/revert_uncommitted_execute_attr tests/serve-automate
        tests/serve-automate-single-run tests/skip_invalid_paths
        tests/update_loses_execute tests/w_selector
Modified files:
        INSTALL Makefile.am NEWS UPGRADE annotate.cc automate.cc
        base.hh cert.cc cert.hh charset.cc charset.hh cmd.hh
        cmd_automate.cc cmd_conflicts.cc cmd_db.cc cmd_diff_log.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
        configure.ac constants.hh contrib/monotone-mail-notify.sh
        database.cc database.hh database_check.cc dates.cc dates.hh
        enumerator.cc enumerator.hh file_io.cc file_io.hh
        git_export.cc key_store.cc key_store.hh keys.cc keys.hh
        lua-testsuite.lua lua.cc lua.hh lua_hooks.cc lua_hooks.hh
        m4/library.m4 merge_conflict.cc merge_content.cc
        merge_roster.cc merge_roster.hh migrate_ancestry.cc
        migrate_schema.cc migration.hh monotone.cc monotone.texi
        netcmd.cc netcmd.hh netsync.cc netxx_pipe.cc options.cc
        options_list.hh packet.cc packet.hh paths.cc paths.hh
        platform-wrapped.hh platform.hh po/de.po po/it.po po/sv.po
        project.cc project.hh rcs_import.cc sanity.cc schema.sql
        selectors.cc std_hooks.lua tester-plaf.hh tester.cc
        testlib.lua
        tests/_MTN_case-folding_security_patch/__driver__.lua
        tests/automate_cert/expected tests/automate_certs/expected
        tests/automate_content_diff/__driver__.lua
        tests/automate_get_attributes/__driver__.lua
        tests/automate_inventory_options/test_hooks.lua
        tests/automate_keys/__driver__.lua
        tests/automate_set_drop_attribute/__driver__.lua
        tests/automate_tags/__driver__.lua
        tests/changing_passphrase_of_a_private_key/__driver__.lua
        tests/clone_branch_no_dir/__driver__.lua
        tests/commit_default_editor/test_hooks.lua
        tests/creating_a_bad_criss-cross_merge/alice.lua
        tests/creating_a_bad_criss-cross_merge/bob.lua
        tests/database_check/__driver__.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/db_data_format_checking/__driver__.lua
        tests/do_not_log_the_result_of_hook_get_passphrase/hook.lua
        tests/drop_a_public_and_private_key/__driver__.lua
        tests/drop_a_public_key/__driver__.lua
        tests/duplicate_key_id/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/generating_and_extracting_keys_and_certs/__driver__.lua
        tests/git_export/__driver__.lua
        tests/importing_cvs_tricky_repo_with_tags/test.tags
        tests/importing_files_with_non-english_names/__driver__.lua
        tests/key_files_created_securely/__driver__.lua
        tests/min_hooks.lua
        tests/mtn_execute_attr_respects_umask/__driver__.lua
        tests/netsync_duplicate_keys/__driver__.lua
        tests/netsync_permissions/__driver__.lua
        tests/p_selector/__driver__.lua
        tests/read_and_convert_old_privkey_packet/__driver__.lua
        tests/resolve_conflicts_all_resolutions/__driver__.lua
        tests/resolve_conflicts_all_resolutions/conflicts-1
        tests/resolve_conflicts_all_resolutions/conflicts-resolved
        tests/resolve_conflicts_all_resolutions/merge-1
        tests/resolve_conflicts_all_resolutions/show_first-checkout_left
        tests/resolve_conflicts_all_resolutions/show_first-checkout_right
        tests/resolve_conflicts_all_resolutions/show_first-thermostat
        tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
        tests/resolve_conflicts_content/conflicts-2
        tests/resolve_conflicts_content/update-1
        tests/resolve_conflicts_errors/__driver__.lua
        tests/resolve_conflicts_none/update-1
        tests/resolve_conflicts_read_all/missing-root_left
        tests/resolve_conflicts_read_all/missing-root_right
        tests/resolve_conflicts_read_all/orphaned-add_left
        tests/resolve_conflicts_read_all/orphaned-add_right
        tests/resolve_conflicts_read_all/orphaned-rename_left
        tests/resolve_conflicts_read_all/orphaned-rename_right
        tests/revert_attrs/__driver__.lua
        tests/revert_file_blocked_by_unversioned_directory/__driver__.lua
        tests/revert_the_middle_of_a_sequence/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        tests/ssh_agent/__driver__.lua tests/test_hooks.lua
        tests/trust_hooks_and_trusted_command/__driver__.lua
        tests/unnormalized_paths_in_database/__driver__.lua txt2c.cc
        ui.cc ui.hh unit-tests/netcmd.cc unit-tests/packet.cc
        unit-tests/uri.cc unix/fs.cc unix/process.cc
        unix/terminal.cc unix/tester-plaf.cc update.cc uri.cc uri.hh
        visualc/config.h vocab.cc vocab_terms.hh win32/README
        win32/fs.cc win32/monotone.iss win32/terminal.cc
        win32/tester-plaf.cc work.cc work.hh
Modified attrs:
        mtn_cvs/lua-testsuite.lua mtn_cvs/old_tests/cleanup
        mtn_cvs/old_tests/cvs_test_setup
        mtn_cvs/old_tests/cvs_test_setup2
        mtn_cvs/old_tests/cvs_test_setup3
        mtn_cvs/old_tests/cvs_test_setup4
        mtn_cvs/old_tests/cvs_test_setup5 mtn_cvs/old_tests/db_setup
        mtn_cvs/old_tests/db_setup2 mtn_cvs/old_tests/settings
        mtn_cvs/old_tests/show_disk_usage mtn_cvs/old_tests/test_all
        tests/db_fix_certs/generate-db.sh
        tests/db_fix_certs/test.mtn

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
8701ff02a2d7e301426491ce9ff5d09bea088d7e)
            to branch 'net.venge.monotone.cvssync.refactor' (head 
886d00a603ce195a8674087cc91b53736a4a3ca1)


monotone --db={your.database} diff 
--revision=8701ff02a2d7e301426491ce9ff5d09bea088d7e 
--revision=9cdfac19850e390a470703aa32762ce2ecedd2ff
monotone --db={your.database} diff 
--revision=886d00a603ce195a8674087cc91b53736a4a3ca1 
--revision=9cdfac19850e390a470703aa32762ce2ecedd2ff
----------------------------------------------------------------------