monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 636caf205d0d9ade959c0959fc7d30fdda70c9


From: monotone
Subject: [Monotone-commits-diffs] Revision 636caf205d0d9ade959c0959fc7d30fdda70c955
Date: Thu, 15 Jun 2006 03:08:29 +0200

-----------------------------------------------------------------
Revision: 636caf205d0d9ade959c0959fc7d30fdda70c955
Ancestor: 9cd7546e72c9fab34607b0272e5eaf91de5555cc
Ancestor: ad6d4a7e114ce4315eed55b0fd2d7845919b075e
Author: Timothy Brownawell  <address@hidden>
Date: 2006-06-14T00:54:15
Branch: net.venge.monotone.lua-testsuite

Deleted entries:
        tests/t_add.at tests/t_add_dot.at tests/t_add_drop_add.at
        tests/t_add_edge.at tests/t_add_executable.at
        tests/t_add_intermediate__MTN_path.at tests/t_add_owndb.at
        tests/t_add_patch_drop_add.at tests/t_add_stomp_file.at
        tests/t_add_vs_commit.at tests/t_ambig_update.at
        tests/t_annotate.at tests/t_annotate_add_collision.at
        tests/t_annotate_branch_collision.at
        tests/t_annotate_copy_all.at
        tests/t_annotate_lineage_dependent.at
        tests/t_annotate_split_line.at tests/t_approval_semantics.at
        tests/t_at_sign.at tests/t_attr.at tests/t_attr_drop.at
        tests/t_attr_init.at tests/t_attributes.at
        tests/t_automate_ancestors.at
        tests/t_automate_ancestry_difference.at
        tests/t_automate_attributes.at tests/t_automate_certs.at
        tests/t_automate_descendents.at
        tests/t_automate_erase_ancestors.at
        tests/t_automate_graph.at tests/t_automate_heads.at
        tests/t_automate_inventory.at tests/t_automate_leaves.at
        tests/t_automate_select.at tests/t_automate_stdio.at
        tests/t_automate_toposort.at tests/t_automate_version.at
        tests/t_bad_packets.at tests/t_branch_checkout.at
        tests/t_can_execute.at tests/t_cat_file_by_name.at
        tests/t_cdiff.at tests/t_change_empty_file.at
        tests/t_check_same_db_contents.at
        tests/t_checkout_creates_log.at tests/t_checkout_dir.at
        tests/t_checkout_id_sets_branch.at
        tests/t_checkout_noop_on_fail.at tests/t_checkout_options.at
        tests/t_chkeypass.at tests/t_cleanup_empty_dir.at
        tests/t_cmdline_options.at tests/t_command_completion.at
        tests/t_commit_log_1.at tests/t_commit_log_2.at
        tests/t_commit_log_3.at tests/t_commit_message_file.at
        tests/t_commit_validate.at tests/t_crlf.at tests/t_cross.at
        tests/t_cvsimport.at tests/t_cvsimport2.at
        tests/t_cvsimport3.at tests/t_cvsimport_deleted_invar.at
        tests/t_cvsimport_drepper.at tests/t_cvsimport_drepper2.at
        tests/t_cvsimport_manifest_cycle.at
        tests/t_cvsimport_samelog.at tests/t_cwork.at
        tests/t_database_check.at tests/t_database_check_minor.at
        tests/t_db_execute.at
        tests/t_db_kill_branch_certs_locally.at
        tests/t_db_kill_rev_locally.at tests/t_db_missing.at
        tests/t_db_with_dots.at tests/t_delete_dir.at
        tests/t_delete_dir_patch.at tests/t_diff_added_file.at
        tests/t_diff_binary.at tests/t_diff_currev.at
        tests/t_diff_first_rev.at tests/t_diff_restrict.at
        tests/t_disapprove.at tests/t_drop.at tests/t_drop_attr.at
        tests/t_drop_missing.at tests/t_drop_rename_patch.at
        tests/t_drop_vs_dropadd.at tests/t_drop_vs_patch_rename.at
        tests/t_dropkey_1.at tests/t_dropkey_2.at
        tests/t_dump_load.at tests/t_empty_env.at
        tests/t_empty_id_completion.at tests/t_empty_path.at
        tests/t_epoch.at tests/t_epoch_server.at
        tests/t_epoch_unidirectional.at tests/t_erename.at
        tests/t_existsonpath.at tests/t_explicit_merge.at
        tests/t_final_space.at tests/t_fmerge.at
        tests/t_fmerge_normalize.at tests/t_fork.at
        tests/t_genkey.at tests/t_heads.at
        tests/t_heads_discontinuous_branch.at
        tests/t_i18n_changelog.at tests/t_i18n_file.at
        tests/t_i18n_file_data.at tests/t_import.at
        tests/t_inodeprints.at tests/t_inodeprints_hook.at
        tests/t_inodeprints_update.at tests/t_largish_file.at
        tests/t_lca_1.at tests/t_lf_crlf.at
        tests/t_load_into_existing.at tests/t_log_depth_single.at
        tests/t_log_last_next.at tests/t_log_nonexistent.at
        tests/t_ls_known.at tests/t_ls_missing.at
        tests/t_lua_includedir.at tests/t_merge.at
        tests/t_merge2_add.at tests/t_merge2_add_drop_add.at
        tests/t_merge2_data.at tests/t_merge_1.at tests/t_merge_2.at
        tests/t_merge_3.at tests/t_merge_4.at tests/t_merge_5.at
        tests/t_merge_6.at tests/t_merge_add.at
        tests/t_merge_add_del.at tests/t_merge_ancestor.at
        tests/t_merge_manual.at
        tests/t_merge_normalization_edge_case.at
        tests/t_merge_rename_file_and_rename_dir.at
        tests/t_migrate_schema.at tests/t_monotone_agent.at
        tests/t_monotone_up.at tests/t_movedel.at
        tests/t_movepatch.at tests/t_multiple_heads_msg.at
        tests/t_need_mt_revision.at tests/t_netsync.at
        tests/t_netsync_absorbs.at
        tests/t_netsync_checks_server_key.at
        tests/t_netsync_defaults.at tests/t_netsync_diffbranch.at
        tests/t_netsync_error.at tests/t_netsync_exclude.at
        tests/t_netsync_exclude_default.at tests/t_netsync_globs.at
        tests/t_netsync_largish_file.at tests/t_netsync_nocerts.at
        tests/t_netsync_permissions.at tests/t_netsync_pubkey.at
        tests/t_netsync_read_permissions.at
        tests/t_netsync_repeated.at tests/t_netsync_set_defaults.at
        tests/t_netsync_sigpipe.at tests/t_netsync_single.at
        tests/t_netsync_unrelated.at tests/t_no_change_deltas.at
        tests/t_no_rename_overwrite.at
        tests/t_normalized_filenames.at tests/t_null.at
        tests/t_options.at tests/t_override_author_date.at
        tests/t_parents_children.at tests/t_patch_drop_add.at
        tests/t_patch_vs_drop_add.at tests/t_persist_phrase.at
        tests/t_persistent_server_keys.at
        tests/t_persistent_server_keys_2.at
        tests/t_persistent_server_revision.at
        tests/t_propagate_anc.at tests/t_propagate_desc.at
        tests/t_rcfile_dir.at tests/t_rcfile_required.at
        tests/t_rcfile_stdin.at tests/t_rcs_import.at
        tests/t_refresh_inodeprints.at
        tests/t_related_merge2_data.at tests/t_remerge.at
        tests/t_rename.at tests/t_rename_added_in_rename.at
        tests/t_rename_attr.at tests/t_rename_conflict.at
        tests/t_rename_dir_add_dir_with_old_name.at
        tests/t_rename_dir_cross_level.at
        tests/t_rename_dir_patch.at tests/t_rename_file_to_dir.at
        tests/t_renamed.at tests/t_replace_dir_with_file.at
        tests/t_replace_file_with_dir.at
        tests/t_restricted_commit_with_inodeprints.at
        tests/t_restrictions.at
        tests/t_restrictions_warn_on_unknown.at tests/t_revert.at
        tests/t_revert_dirs.at tests/t_revert_rename.at
        tests/t_revert_restrict.at tests/t_revert_unchanged.at
        tests/t_scan.at tests/t_select_cert.at
        tests/t_selector_later_earlier.at tests/t_set_default.at
        tests/t_setup_checkout_modify_new_dir.at
        tests/t_setup_creates_log.at tests/t_short_opts.at
        tests/t_single_char_filenames.at tests/t_singlecvs.at
        tests/t_sql_gunzip.at tests/t_status.at
        tests/t_status_missing.at tests/t_sticky_branch.at
        tests/t_subdir_add.at tests/t_subdir_attr.at
        tests/t_subdir_drop.at tests/t_subdir_rename.at
        tests/t_subdir_revert.at tests/t_subdirs.at tests/t_tags.at
        tests/t_testresult.at tests/t_trusted.at
        tests/t_undo_update.at tests/t_unidiff.at
        tests/t_unidiff2.at tests/t_unidiff3.at
        tests/t_unreadable__MTN.at tests/t_update.at
        tests/t_update_1.at tests/t_update_2.at
        tests/t_update_missing.at tests/t_update_nonexistent.at
        tests/t_update_null_revision.at tests/t_update_off_branch.at
        tests/t_update_to_revision.at
        tests/t_update_with_blocked_rename.at
        tests/t_update_with_pending_add.at
        tests/t_update_with_pending_drop.at
        tests/t_update_with_pending_rename.at tests/t_vars.at
        tests/t_vcheck.at tests/t_versions.at
Added files:
        tester-tests/cleanup-1/__driver__.lua
        tester-tests/cleanup-2/__driver__.lua
        tester-tests/isolated-1/__driver__.lua
        tester-tests/isolated-2/__driver__.lua tester-testsuite.lua
        tests/'heads'/__driver__.lua
        tests/'heads'_with_discontinuous_branches/__driver__.lua
        tests/(imp)_deleting_directories/__driver__.lua
        tests/(imp)_merge((patch_foo_a),_(delete_foo_))/__driver__.lua
        tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua
        tests/(minor)_add_own_db/__driver__.lua
        tests/(minor)_context_diff/__driver__.lua
        tests/(minor)_drop_in_subdir/__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/(minor)_update_cleans_emptied_directories/__driver__.lua
        tests/(normal)_netsync_on_partially_unrelated_revisions/__driver__.lua
        tests/(normal)_netsync_revision_with_no_certs/__driver__.lua
        tests/(normal)_update_across_discontinuity/__driver__.lua
        tests/(todo)_design_approval_semantics/__driver__.lua
        tests/(todo)_undo_update_command/__driver__.lua
        tests/(todo)_vcheck/__driver__.lua
        tests/(todo)_write_monotone-agent/__driver__.lua
        tests/--author,_--date/__driver__.lua
        tests/--db_with_parent_dir/__driver__.lua
        tests/--rcfile=-/__driver__.lua tests/--rcfile=-/foo.rc
        tests/--rcfile=directory/__driver__.lua
        tests/--rcfile=directory/aaa.rc
        tests/--rcfile=directory/aba.rc
        tests/--rcfile=directory/bbb.rc
        tests/--rcfile_requires_extant_file/__driver__.lua
        tests/CRLF_line_normalization/__driver__.lua
        tests/_MTN_revision_is_required/__driver__.lua
        tests/a_tricky_cvs_repository_with_tags/__driver__.lua
        tests/a_tricky_cvs_repository_with_tags/e/t/libasm/ChangeLog,v
        tests/a_tricky_cvs_repository_with_tags/e/t/libelf-po/POTFILES.in,v
        tests/a_tricky_cvs_repository_with_tags/test.manifest
        tests/a_tricky_cvs_repository_with_tags/test.tags
        tests/add_and_then_drop_file_does_nothing/__driver__.lua
        tests/add_executable/__driver__.lua
        tests/add_in_subdir/__driver__.lua
        tests/add_workspace_commit_in_another/__driver__.lua
        tests/add_workspace_commit_in_another/foo.alice
        tests/add_workspace_commit_in_another/foo.bob
        tests/addition_of_files_and_directories/__driver__.lua
        tests/annotate_file_added_on_different_forks/__driver__.lua
        tests/annotate_file_added_on_different_forks/merge2.lua
        tests/annotate_file_on_multirooted_branch/__driver__.lua
        tests/annotate_file_on_multirooted_branch/merge2.lua
        tests/annotate_where_line_splits/__driver__.lua
        tests/annotate_where_line_splits/merge.lua
        tests/annotate_where_lineage_depends_on_traversal/__driver__.lua
        tests/annotate_where_lineage_depends_on_traversal/merge.lua
        tests/annotate_where_one_parent_is_full_copy/__driver__.lua
        tests/attr_command_in_subdirs/__driver__.lua
        tests/attr_drop/__driver__.lua
        tests/attr_init_functions/__driver__.lua
        tests/attr_init_functions/hook.lua
        tests/attr_set_attr_get/__driver__.lua
        tests/attr_set_get_commands/__driver__.lua
        tests/automate_ancestors/__driver__.lua
        tests/automate_ancestry_difference/__driver__.lua
        tests/automate_attributes/__driver__.lua
        tests/automate_automate_version/__driver__.lua
        tests/automate_certs/__driver__.lua
        tests/automate_certs/expected
        tests/automate_descendents/__driver__.lua
        tests/automate_erase_ancestors/__driver__.lua
        tests/automate_graph/__driver__.lua
        tests/automate_heads/__driver__.lua
        tests/automate_leaves/__driver__.lua
        tests/automate_parents,_automate_children/__driver__.lua
        tests/automate_stdio/__driver__.lua
        tests/automate_toposort/__driver__.lua
        tests/bad_packet_args/__driver__.lua
        tests/basic_invocation_and_options/__driver__.lua
        tests/branch-based_checkout/__driver__.lua
        tests/calculation_of_other_unidiffs/__driver__.lua
        tests/calculation_of_other_unidiffs/firstfile
        tests/calculation_of_other_unidiffs/secondfile
        tests/calculation_of_unidiffs/__driver__.lua
        tests/calculation_of_unidiffs/firstfile
        tests/calculation_of_unidiffs/secondfile
        tests/can_execute_things/__driver__.lua
        tests/can_execute_things/nix-cphook.lua
        tests/can_execute_things/win-cphook.lua
        tests/cat_-r_REV_PATH/__driver__.lua
        tests/changing_passphrase_of_a_private_key/__driver__.lua
        tests/check_automate_select/__driver__.lua
        tests/check_later_and_earlier_selectors/__driver__.lua
        tests/check_same_db_contents_macro/__driver__.lua
        tests/check_that_--xargs_and_-(at)_behave_correctly/__driver__.lua
        tests/checking_a_few_command_specific_options/__driver__.lua
        tests/checkout_creates__MTN_log/__driver__.lua
        tests/checkout_creates__MTN_log/commit_log.lua
        tests/checkout_creates_right__MTN_options/__driver__.lua
        tests/checkout_validates_target_directory/__driver__.lua
        tests/checkout_without_--branch_sets_branch/__driver__.lua
        tests/command_completion/__driver__.lua
        tests/commit_update_multiple_heads_message/__driver__.lua
        tests/commit_using__MTN_log/__driver__.lua
        tests/commit_using__MTN_log/commit_log.lua
        tests/commit_using__MTN_log_and_--message/__driver__.lua
        tests/commit_using__MTN_log_and_--message/commit_log.lua
        tests/commit_validation_lua_hook/__driver__.lua
        tests/commit_validation_lua_hook/commit_validate.lua
        tests/commit_validation_lua_hook/errmsg
        tests/commit_w_o__MTN_log_being_present/__driver__.lua
        tests/commit_with_--message-file/__driver__.lua
        tests/committing_with_a_non-english_message/__driver__.lua
        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/creating_a_bad_criss-cross_merge/__driver__.lua
        tests/creating_a_bad_criss-cross_merge/alice.lua
        tests/creating_a_bad_criss-cross_merge/bob.lua
        tests/creating_a_fork/__driver__.lua
        tests/creating_a_fork_and_merging/__driver__.lua
        tests/creating_a_fork_and_merging/bothinsert
        tests/creating_a_fork_and_merging/firstinsert
        tests/creating_a_fork_and_merging/origfile
        tests/creating_a_fork_and_merging/secondinsert
        tests/creating_a_fork_and_updating/__driver__.lua
        tests/creating_a_fork_and_updating/bothinsert
        tests/creating_a_fork_and_updating/firstinsert
        tests/creating_a_fork_and_updating/origfile
        tests/creating_a_fork_and_updating/secondinsert
        tests/creating_a_good_and_bad_test_result/__driver__.lua
        tests/creating_a_good_and_bad_test_result/bad
        tests/creating_a_good_and_bad_test_result/final
        tests/creating_a_good_and_bad_test_result/good
        tests/creating_a_good_and_bad_test_result/root
        tests/creating_a_good_and_bad_test_result/work
        tests/cvs_import,_deleted_file_invariant/__driver__.lua
        tests/cvs_import,_deleted_file_invariant/attest/afile,v
        tests/cvs_import,_deleted_file_invariant/attest/bfile,v
        tests/cvs_import,_deleted_file_invariant/attest/cfile,v
        tests/cvs_import,_file_dead_on_head_and_branch/__driver__.lua
        tests/cvs_import,_file_dead_on_head_and_branch/cvsfile,v
        tests/cvs_import_with_file_added_on_a_branch/__driver__.lua
        tests/database_check/__driver__.lua
        tests/database_dump_load/__driver__.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/db_execute/__driver__.lua
        tests/db_kill_branch_certs_locally_command/__driver__.lua
        tests/db_kill_rev_locally_command/__driver__.lua
        tests/db_load_must_create_a_new_db/__driver__.lua
        tests/db_missing/__driver__.lua
        tests/delete_work_file_on_checkout/__driver__.lua
        tests/diff_a_binary_file/__driver__.lua
        tests/diff_a_binary_file/binary
        tests/diff_against_empty_file/__driver__.lua
        tests/diff_in_a_never-committed_project/__driver__.lua
        tests/diff_respects_restrictions/__driver__.lua
        tests/diffing_a_revision_with_an_added_file/__driver__.lua
        tests/diffing_with_explicit_rev_same_as_wc_rev/__driver__.lua
        tests/disapproving_of_a_revision/__driver__.lua
        tests/disapproving_of_a_revision/badfile
        tests/disapproving_of_a_revision/finalfile
        tests/disapproving_of_a_revision/goodfile
        tests/disapproving_of_a_revision/rootfile
        tests/disapproving_of_a_revision/updatefile
        tests/drop_a_public_and_private_key/__driver__.lua
        tests/drop_a_public_key/__driver__.lua
        tests/drop_a_public_key/pubkey.txt
        tests/drop_missing_and_unknown_files/__driver__.lua
        tests/drop_removes_attributes/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/empty_id_completion/__driver__.lua
        tests/empty_string_as_a_path_name/__driver__.lua
        tests/exchanging_work_via_netsync/__driver__.lua
        tests/explicit_merge/__driver__.lua
        tests/explicit_merge/dont_merge tests/explicit_merge/left
        tests/explicit_merge/merged tests/explicit_merge/right
        tests/explicit_merge/testfile
        tests/external_unit_test_of_the_line_merger/__driver__.lua
        tests/external_unit_test_of_the_line_merger/ancestor
        tests/external_unit_test_of_the_line_merger/left
        tests/external_unit_test_of_the_line_merger/right
        tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua
        tests/failed_checkout_is_a_no-op/__driver__.lua
        tests/files_with_intermediate__MTN_path_elements/__driver__.lua
        tests/files_with_non-utf8_data/8859-5.lua
        tests/files_with_non-utf8_data/__driver__.lua
        tests/files_with_non-utf8_data/euc.lua
        tests/files_with_non-utf8_data/jp-euc
        tests/files_with_non-utf8_data/jp-utf8
        tests/files_with_non-utf8_data/ru-8859-5
        tests/files_with_non-utf8_data/ru-utf8
        tests/files_with_spaces_at_the_end/__driver__.lua
        tests/first_extent_normalization_pass/__driver__.lua
        tests/first_extent_normalization_pass/left
        tests/first_extent_normalization_pass/right
        tests/generating_and_extracting_keys_and_certs/__driver__.lua
        tests/get_netsync_read_permitted/__driver__.lua
        tests/get_netsync_read_permitted/read-permissions
        tests/importing_a_cvs_file_with_one_version/__driver__.lua
        tests/importing_a_file/__driver__.lua
        tests/importing_a_small,_real_cvs_repository/__driver__.lua
        tests/importing_a_small,_real_cvs_repository/e/src/Attic/objdump.c,v
        tests/importing_a_small,_real_cvs_repository/e/tests/asm-tst3.c,v
        tests/importing_a_small,_real_cvs_repository/e/tests/asm-tst4.c,v
        tests/importing_a_small,_real_cvs_repository/test.manifest
        tests/importing_cvs_files/__driver__.lua
        tests/importing_cvs_files_with_identical_logs/__driver__.lua
        tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua
        tests/importing_files_with_non-english_names/__driver__.lua
        tests/include()_and_includedir()_lua_functions/__driver__.lua
        tests/include()_and_includedir()_lua_functions/aaa.rc
        tests/include()_and_includedir()_lua_functions/aba.rc
        tests/include()_and_includedir()_lua_functions/bbb.zz
        tests/inodeprints/__driver__.lua
        tests/largish_file/__driver__.lua
        tests/list_missing_files/__driver__.lua
        tests/listing_workspace_manifests/__driver__.lua
        tests/log_--last=N_--next=N/__driver__.lua
        tests/log_--last=N_FILENAME/__driver__.lua
        tests/log_hides_deleted_renamed_files/__driver__.lua
        tests/log_hides_deleted_renamed_files/first
        tests/log_hides_deleted_renamed_files/second
        tests/lua_function_existsonpath/__driver__.lua
        tests/lua_function_existsonpath/test.lua
        tests/manifest_restrictions/__driver__.lua
        tests/manifest_restrictions/ignored.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_manual_file/__driver__.lua
        tests/merge_manual_file/binary.lua
        tests/merge_manual_file/left.bmp
        tests/merge_manual_file/parent.bmp
        tests/merge_manual_file/right.bmp
        tests/merge_manual_file/text.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/merge_rename_file_and_rename_dir/__driver__.lua
        tests/merge_rev_with_ancestor/__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_a_rename_twice/__driver__.lua
        tests/merging_adds/__driver__.lua
        tests/merging_adds_in_unrelated_revisions/__driver__.lua
        tests/merging_an_add_edge/__driver__.lua
        tests/merging_data_in_unrelated_files/__driver__.lua
        tests/merging_data_in_unrelated_files/left
        tests/merging_data_in_unrelated_files/right
        tests/merging_data_in_unrelated_revisions/__driver__.lua
        tests/merging_data_in_unrelated_revisions/left
        tests/merging_data_in_unrelated_revisions/right
        tests/min_hooks.lua
        tests/modification_of_an_empty_file/__driver__.lua
        tests/mtn_add_dot/__driver__.lua tests/mtn_up/__driver__.lua
        tests/multiple_version_committing/__driver__.lua
        tests/netsync,--exclude,defaults/__driver__.lua
        tests/netsync,--set-default/__driver__.lua
        tests/netsync_badhost_gives_nice_error/__driver__.lua
        tests/netsync_client_absorbs_and_checks_epochs/__driver__.lua
        tests/netsync_client_absorbs_server_key/__driver__.lua
        tests/netsync_default_server_pattern/__driver__.lua
        tests/netsync_default_server_pattern_setting/__driver__.lua
        tests/netsync_epochs_are_not_sent_upstream_by_pull/__driver__.lua
        tests/netsync_is_not_interrupted_by_SIGPIPE/__driver__.lua
        tests/netsync_largish_file/__driver__.lua
        tests/netsync_permissions/__driver__.lua
        tests/netsync_permissions/closed/read-permissions
        tests/netsync_permissions/closed/write-permissions
        tests/netsync_permissions/open/read-permissions
        tests/netsync_permissions/open/write-permissions
        tests/netsync_server_absorbs_and_checks_epochs/__driver__.lua
        tests/netsync_transfers_public_keys/__driver__.lua
        tests/netsync_transfers_public_keys/newkeys.txt
        tests/netsync_verifies_server_keys/__driver__.lua
        tests/netsync_with_globs/__driver__.lua
        tests/no-change_deltas_disappear/__driver__.lua
        tests/normalized_filenames/__driver__.lua
        tests/persistence_of_passphrase/__driver__.lua
        tests/persistence_of_passphrase/persist.lua
        tests/persistent_netsync_server_-_keys/__driver__.lua
        tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua
        tests/propagate_a_descendent/__driver__.lua
        tests/propagate_an_ancestor/__driver__.lua
        
tests/pull_a_netsync_branch_which_has_a_parent_from_another_branch/__driver__.lua
        tests/refresh_inodeprints/__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_in_subdir/__driver__.lua
        tests/rename_moves_attributes/__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/repeatedly_exchanging_work_via_netsync/__driver__.lua
        tests/replace_dir_with_file/__driver__.lua
        tests/replace_file_with_dir/__driver__.lua
        tests/restricted_commit_with_inodeprints/__driver__.lua
        tests/revert_directories/__driver__.lua
        tests/revert_file_to_base_revision/__driver__.lua
        tests/revert_in_subdirs/__driver__.lua
        tests/revert_renames/__driver__.lua
        tests/revert_unchanged_file_preserves_mtime/__driver__.lua
        tests/revert_works_with_restrictions/__driver__.lua
        tests/revert_works_with_restrictions/ignore_hook.lua
        tests/scanning_trees/__driver__.lua
        tests/scanning_trees/manifest
        
tests/schema_migration/1db80c7cee8fa966913db1a463ed50bf1b0e5b0e.mtn.dumped
        
tests/schema_migration/9d2b5d7b86df00c30ac34fe87a3c20f1195bb2df.mtn.dumped
        tests/schema_migration/__driver__.lua
        tests/schema_migration/migrate_keys
        tests/selecting_arbitrary_certs/__driver__.lua
        tests/serve_pull_with_--exclude/__driver__.lua
        tests/setup_checkout_touch_new__MTN_options_only/__driver__.lua
        tests/setup_creates__MTN_log/__driver__.lua
        tests/short_options_work_correctly/__driver__.lua
        tests/single_character_filename_support/__driver__.lua
        tests/single_manifest_netsync/__driver__.lua
        tests/sql_function_gunzip_(which_replaced_unpack)/__driver__.lua
        tests/status/__driver__.lua
        tests/status_with_missing_files/__driver__.lua
        tests/sticky_branches/__driver__.lua
        tests/subdirectory_restrictions/__driver__.lua
        tests/tags_and_tagging_of_revisions/__driver__.lua
        tests/test_a_merge/__driver__.lua tests/test_a_merge/correct
        tests/test_a_merge/left tests/test_a_merge/parent
        tests/test_a_merge/right tests/test_a_merge_2/__driver__.lua
        tests/test_a_merge_2/correct tests/test_a_merge_2/left
        tests/test_a_merge_2/parent tests/test_a_merge_2/right
        tests/test_a_merge_5/__driver__.lua
        tests/test_a_merge_5/correct tests/test_a_merge_5/left
        tests/test_a_merge_5/parent tests/test_a_merge_5/right
        tests/test_a_merge_6/__driver__.lua
        tests/test_a_merge_6/correct tests/test_a_merge_6/left
        tests/test_a_merge_6/parent tests/test_a_merge_6/right
        tests/test_annotate_command/__driver__.lua
        tests/test_hooks.lua tests/test_keys
        tests/test_problematic_cvs_import/__driver__.lua
        tests/test_problematic_cvs_import/rcsfile,v
        tests/trust_hooks_and_'trusted'_command/__driver__.lua
        tests/update_1/__driver__.lua
        tests/update_does_not_stomp_non-monotone_files/__driver__.lua
        tests/update_no-ops_when_no_parent_revision/__driver__.lua
        tests/update_to_non-existent_rev/__driver__.lua
        tests/update_to_off-branch_rev/__driver__.lua
        tests/update_updates_inodeprints/__driver__.lua
        tests/update_with_blocked_rename/__driver__.lua
        tests/update_with_multiple_candidates/__driver__.lua
        tests/update_with_pending_add/__driver__.lua
        tests/update_with_pending_drop/__driver__.lua
        tests/update_with_pending_rename/__driver__.lua
        tests/updating_from_a_merge_which_adds_a_file/__driver__.lua
        tests/updating_to_a_given_revision/__driver__.lua
        tests/updating_to_a_given_revision/left-leaf
        tests/updating_to_a_given_revision/middle
        tests/updating_to_a_given_revision/modified-left-leaf
        tests/updating_to_a_given_revision/modified-root
        tests/updating_to_a_given_revision/right-leaf
        tests/updating_to_a_given_revision/root
        tests/use_get_linesep_conv_hook/__driver__.lua
        tests/use_get_linesep_conv_hook/linesep.lua
        tests/use_inodeprints_hook/__driver__.lua
        tests/use_inodeprints_hook/off.lua
        tests/use_inodeprints_hook/on.lua tests/vars/__driver__.lua
        tests/verification_of_command_line_options/__driver__.lua
        tests/warn_on_bad_restriction/__driver__.lua
        tests/workspace_inventory/__driver__.lua
        tests/workspace_inventory/inventory_hooks.lua testsuite.lua
Added directories:
        tester-tests tester-tests/cleanup-1 tester-tests/cleanup-2
        tester-tests/isolated-1 tester-tests/isolated-2
        tests/'heads' tests/'heads'_with_discontinuous_branches
        tests/(imp)_deleting_directories
        tests/(imp)_merge((patch_foo_a),_(delete_foo_))
        tests/(imp)_persistent_netsync_server_-_keys_2
        tests/(minor)_add_own_db tests/(minor)_context_diff
        tests/(minor)_drop_in_subdir tests/(minor)_test_a_merge_3
        tests/(minor)_test_a_merge_4
        tests/(minor)_update_cleans_emptied_directories
        tests/(normal)_netsync_on_partially_unrelated_revisions
        tests/(normal)_netsync_revision_with_no_certs
        tests/(normal)_update_across_discontinuity
        tests/(todo)_design_approval_semantics
        tests/(todo)_undo_update_command tests/(todo)_vcheck
        tests/(todo)_write_monotone-agent tests/--author,_--date
        tests/--db_with_parent_dir tests/--rcfile=-
        tests/--rcfile=directory tests/--rcfile_requires_extant_file
        tests/CRLF_line_normalization
        tests/_MTN_revision_is_required
        tests/a_tricky_cvs_repository_with_tags
        tests/a_tricky_cvs_repository_with_tags/e
        tests/a_tricky_cvs_repository_with_tags/e/t
        tests/a_tricky_cvs_repository_with_tags/e/t/libasm
        tests/a_tricky_cvs_repository_with_tags/e/t/libelf-po
        tests/add_and_then_drop_file_does_nothing
        tests/add_executable tests/add_in_subdir
        tests/add_workspace_commit_in_another
        tests/addition_of_files_and_directories
        tests/annotate_file_added_on_different_forks
        tests/annotate_file_on_multirooted_branch
        tests/annotate_where_line_splits
        tests/annotate_where_lineage_depends_on_traversal
        tests/annotate_where_one_parent_is_full_copy
        tests/attr_command_in_subdirs tests/attr_drop
        tests/attr_init_functions tests/attr_set_attr_get
        tests/attr_set_get_commands tests/automate_ancestors
        tests/automate_ancestry_difference tests/automate_attributes
        tests/automate_automate_version tests/automate_certs
        tests/automate_descendents tests/automate_erase_ancestors
        tests/automate_graph tests/automate_heads
        tests/automate_leaves
        tests/automate_parents,_automate_children
        tests/automate_stdio tests/automate_toposort
        tests/bad_packet_args tests/basic_invocation_and_options
        tests/branch-based_checkout
        tests/calculation_of_other_unidiffs
        tests/calculation_of_unidiffs tests/can_execute_things
        tests/cat_-r_REV_PATH
        tests/changing_passphrase_of_a_private_key
        tests/check_automate_select
        tests/check_later_and_earlier_selectors
        tests/check_same_db_contents_macro
        tests/check_that_--xargs_and_-(at)_behave_correctly
        tests/checking_a_few_command_specific_options
        tests/checkout_creates__MTN_log
        tests/checkout_creates_right__MTN_options
        tests/checkout_validates_target_directory
        tests/checkout_without_--branch_sets_branch
        tests/command_completion
        tests/commit_update_multiple_heads_message
        tests/commit_using__MTN_log
        tests/commit_using__MTN_log_and_--message
        tests/commit_validation_lua_hook
        tests/commit_w_o__MTN_log_being_present
        tests/commit_with_--message-file
        tests/committing_with_a_non-english_message tests/common
        tests/creating_a_bad_criss-cross_merge tests/creating_a_fork
        tests/creating_a_fork_and_merging
        tests/creating_a_fork_and_updating
        tests/creating_a_good_and_bad_test_result
        tests/cvs_import,_deleted_file_invariant
        tests/cvs_import,_deleted_file_invariant/attest
        tests/cvs_import,_file_dead_on_head_and_branch
        tests/cvs_import_with_file_added_on_a_branch
        tests/database_check tests/database_dump_load
        tests/db_check_and_non-serious_errors tests/db_execute
        tests/db_kill_branch_certs_locally_command
        tests/db_kill_rev_locally_command
        tests/db_load_must_create_a_new_db tests/db_missing
        tests/delete_work_file_on_checkout tests/diff_a_binary_file
        tests/diff_against_empty_file
        tests/diff_in_a_never-committed_project
        tests/diff_respects_restrictions
        tests/diffing_a_revision_with_an_added_file
        tests/diffing_with_explicit_rev_same_as_wc_rev
        tests/disapproving_of_a_revision
        tests/drop_a_public_and_private_key tests/drop_a_public_key
        tests/drop_missing_and_unknown_files
        tests/drop_removes_attributes tests/empty_environment
        tests/empty_id_completion tests/empty_string_as_a_path_name
        tests/exchanging_work_via_netsync tests/explicit_merge
        tests/external_unit_test_of_the_line_merger
        tests/fail_cleanly_on_unreadable__MTN_options
        tests/failed_checkout_is_a_no-op
        tests/files_with_intermediate__MTN_path_elements
        tests/files_with_non-utf8_data
        tests/files_with_spaces_at_the_end
        tests/first_extent_normalization_pass
        tests/generating_and_extracting_keys_and_certs
        tests/get_netsync_read_permitted
        tests/importing_a_cvs_file_with_one_version
        tests/importing_a_file
        tests/importing_a_small,_real_cvs_repository
        tests/importing_a_small,_real_cvs_repository/e
        tests/importing_a_small,_real_cvs_repository/e/src
        tests/importing_a_small,_real_cvs_repository/e/src/Attic
        tests/importing_a_small,_real_cvs_repository/e/tests
        tests/importing_cvs_files
        tests/importing_cvs_files_with_identical_logs
        tests/importing_cvs_with_vendor_imports_and_branches
        tests/importing_files_with_non-english_names
        tests/include()_and_includedir()_lua_functions
        tests/inodeprints tests/largish_file
        tests/list_missing_files tests/listing_workspace_manifests
        tests/log_--last=N_--next=N tests/log_--last=N_FILENAME
        tests/log_hides_deleted_renamed_files
        tests/lua_function_existsonpath tests/manifest_restrictions
        tests/merge((),_(add_a,_drop_a,_add_a))
        tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))
        tests/merge((),_(drop_a,_rename_b_a,_patch_a))
        tests/merge((),_(patch_a,_drop_a,_add_a))
        tests/merge((add_a),_(add_a,_drop_a,_add_a))
        tests/merge((drop_a),_(drop_a,_add_a))
        tests/merge((drop_a),_(rename_a_b,_patch_b))
        tests/merge((patch_a),_(drop_a,_add_a))
        tests/merge((patch_foo_a),_(rename_foo__bar_))
        tests/merge((rename_a_b),_(rename_a_c))
        tests/merge_manual_file tests/merge_normalization_edge_case
        tests/merge_rename_file_and_rename_dir
        tests/merge_rev_with_ancestor
        tests/merge_with_add,_rename_file,_and_rename_dir
        tests/merging_(add_a)_with_(add_a,_drop_a)
        tests/merging_a_rename_twice tests/merging_adds
        tests/merging_adds_in_unrelated_revisions
        tests/merging_an_add_edge
        tests/merging_data_in_unrelated_files
        tests/merging_data_in_unrelated_revisions
        tests/modification_of_an_empty_file tests/mtn_add_dot
        tests/mtn_up tests/multiple_version_committing
        tests/netsync,--exclude,defaults tests/netsync,--set-default
        tests/netsync_badhost_gives_nice_error
        tests/netsync_client_absorbs_and_checks_epochs
        tests/netsync_client_absorbs_server_key
        tests/netsync_default_server_pattern
        tests/netsync_default_server_pattern_setting
        tests/netsync_epochs_are_not_sent_upstream_by_pull
        tests/netsync_is_not_interrupted_by_SIGPIPE
        tests/netsync_largish_file tests/netsync_permissions
        tests/netsync_permissions/closed
        tests/netsync_permissions/open
        tests/netsync_server_absorbs_and_checks_epochs
        tests/netsync_transfers_public_keys
        tests/netsync_verifies_server_keys tests/netsync_with_globs
        tests/no-change_deltas_disappear tests/normalized_filenames
        tests/persistence_of_passphrase
        tests/persistent_netsync_server_-_keys
        tests/persistent_netsync_server_-_revs_&_certs
        tests/propagate_a_descendent tests/propagate_an_ancestor
        tests/pull_a_netsync_branch_which_has_a_parent_from_another_branch
        tests/refresh_inodeprints
        tests/rename_cannot_overwrite_files
        tests/rename_dir_to_non-sibling tests/rename_file_to_dir
        tests/rename_in_subdir tests/rename_moves_attributes
        tests/renaming_a_deleted_file tests/renaming_a_directory
        tests/renaming_a_directory_and_then_adding_a_new_with_the_old_name
        tests/renaming_a_file tests/renaming_a_patched_file
        tests/renaming_and_editing_a_file
        tests/repeatedly_exchanging_work_via_netsync
        tests/replace_dir_with_file tests/replace_file_with_dir
        tests/restricted_commit_with_inodeprints
        tests/revert_directories tests/revert_file_to_base_revision
        tests/revert_in_subdirs tests/revert_renames
        tests/revert_unchanged_file_preserves_mtime
        tests/revert_works_with_restrictions tests/scanning_trees
        tests/schema_migration tests/selecting_arbitrary_certs
        tests/serve_pull_with_--exclude
        tests/setup_checkout_touch_new__MTN_options_only
        tests/setup_creates__MTN_log
        tests/short_options_work_correctly
        tests/single_character_filename_support
        tests/single_manifest_netsync
        tests/sql_function_gunzip_(which_replaced_unpack)
        tests/status tests/status_with_missing_files
        tests/sticky_branches tests/subdirectory_restrictions
        tests/tags_and_tagging_of_revisions tests/test_a_merge
        tests/test_a_merge_2 tests/test_a_merge_5
        tests/test_a_merge_6 tests/test_annotate_command
        tests/test_problematic_cvs_import
        tests/trust_hooks_and_'trusted'_command tests/update_1
        tests/update_does_not_stomp_non-monotone_files
        tests/update_no-ops_when_no_parent_revision
        tests/update_to_non-existent_rev
        tests/update_to_off-branch_rev
        tests/update_updates_inodeprints
        tests/update_with_blocked_rename
        tests/update_with_multiple_candidates
        tests/update_with_pending_add tests/update_with_pending_drop
        tests/update_with_pending_rename
        tests/updating_from_a_merge_which_adds_a_file
        tests/updating_to_a_given_revision
        tests/use_get_linesep_conv_hook tests/use_inodeprints_hook
        tests/vars tests/verification_of_command_line_options
        tests/warn_on_bad_restriction tests/workspace_inventory
Modified files:
        ChangeLog Makefile.am cmd_merging.cc database.cc platform.hh
        po/it.po po/sv.po std_hooks.lua tester.cc tester.lua
        testsuite.at unix/process.cc visualc/monotone.sln
        visualc/monotone.vcproj visualc/sqlite3.vcproj
        win32/process.cc win32/read_password.cc
Modified attrs:
        testsuite.lua

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
ad6d4a7e114ce4315eed55b0fd2d7845919b075e)
            to branch 'net.venge.monotone.lua-testsuite' (head 
9cd7546e72c9fab34607b0272e5eaf91de5555cc)


monotone --db={your.database} diff 
--revision=9cd7546e72c9fab34607b0272e5eaf91de5555cc 
--revision=636caf205d0d9ade959c0959fc7d30fdda70c955
monotone --db={your.database} diff 
--revision=ad6d4a7e114ce4315eed55b0fd2d7845919b075e 
--revision=636caf205d0d9ade959c0959fc7d30fdda70c955
----------------------------------------------------------------------




reply via email to

[Prev in Thread] Current Thread [Next in Thread]