[Monotone-commits-diffs] Revision 65b029d683d95ca882703cdda6e505a5b14acc0c

[monotone]

-----------------------------------------------------------------
Revision: 65b029d683d95ca882703cdda6e505a5b14acc0c
Ancestor: 5a48beac7cb9a305078ab250831a4a33deaa3f72
Ancestor: d5d7b7ee557d160a63144511a6502863da1f6c1a
Author: address@hidden
Date: 2007-02-28T14:58:18
Branch: net.venge.monotone.cvssync.refactor

Deleted entries:
        tests/common/automate_ancestry.lua tests/common/cvs.lua
        tests/common/netsync-hooks.lua
        tests/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua tests/common/selectors.lua
Added files:
        mtn_cvs/CVS_prot mtn_cvs/Makefile.am mtn_cvs/botan/md5.cpp
        mtn_cvs/botan/md5.h 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/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_loop/__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
        mtn_cvs/testsuite.lua
        tests/automate_put_revision_for_merge/__driver__.lua
        tests/automate_sync_info/__driver__.lua
        tests/status_with_attrs/__driver__.lua
Added directories:
        mtn_cvs mtn_cvs/botan 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_loop
        mtn_cvs/tests/push_simple mtn_cvs/tests/takeover_basic
        mtn_cvs/tests/takeover_modified
        tests/automate_put_revision_for_merge
        tests/automate_sync_info tests/status_with_attrs
Modified files:
        Makefile.am automate.cc cmd_diff_log.cc cmd_ws_commit.cc
        commands.cc configure.ac database.cc file_io.cc file_io.hh
        monotone.texi options_list.hh po/de.po revision.cc
        sqlite/btree.c sqlite/build.c sqlite/callback.c
        sqlite/delete.c sqlite/expr.c sqlite/func.c sqlite/opcodes.c
        sqlite/opcodes.h sqlite/os_os2.c sqlite/os_unix.c
        sqlite/parse.c sqlite/parse.h sqlite/select.c
        sqlite/sqlite3.h sqlite/sqliteInt.h sqlite/update.c
        sqlite/vdbemem.c sqlite/where.c 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_into_workspace_attr_corpse/__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_inodeprint_from_birth/__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 ui.cc ui.hh
        work.cc work.hh
Modified attrs:
        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
        mtn_cvs/testsuite.lua

ChangeLog: 

propagate from branch 'net.venge.monotone.cvssync.candidates' (head 
5a48beac7cb9a305078ab250831a4a33deaa3f72)
            to branch 'net.venge.monotone.cvssync.refactor' (head 
d5d7b7ee557d160a63144511a6502863da1f6c1a)


monotone --db={your.database} diff 
--revision=5a48beac7cb9a305078ab250831a4a33deaa3f72 
--revision=65b029d683d95ca882703cdda6e505a5b14acc0c
monotone --db={your.database} diff 
--revision=d5d7b7ee557d160a63144511a6502863da1f6c1a 
--revision=65b029d683d95ca882703cdda6e505a5b14acc0c
----------------------------------------------------------------------