[Monotone-commits-diffs] Revision 64001650a3aa556bfabc28224955c048057416df

[monotone]

-----------------------------------------------------------------
Revision: 64001650a3aa556bfabc28224955c048057416df
Ancestor: 3059e5823903e47e0b2926a067f01c19faaf484b
Ancestor: 3f7b29b395be4f02671a84437c9a8450e8afd075
Author: address@hidden
Date: 2010-01-02 08.13.09
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Deleted entries:
        debian debian/NEWS debian/changelog debian/compat
        debian/control debian/copyright debian/monotone-doc.dirs
        debian/monotone-doc.doc-base debian/monotone-doc.docs
        debian/monotone-doc.info debian/monotone-doc.postinst
        debian/monotone-server.README.Debian
        debian/monotone-server.TODO.Debian
        debian/monotone-server.config debian/monotone-server.dirs
        debian/monotone-server.monotone.default
        debian/monotone-server.monotone.init
        debian/monotone-server.postinst
        debian/monotone-server.postrm
        debian/monotone-server.templates
        debian/monotone.README.Debian debian/monotone.TODO.Debian
        debian/monotone.dirs debian/monotone.docs
        debian/monotone.examples debian/monotone.manpages
        debian/mtn.1 debian/po debian/po/POTFILES.in debian/po/cs.po
        debian/po/de.po debian/po/fr.po debian/po/ja.po
        debian/po/nl.po debian/po/pt.po debian/po/sv.po
        debian/po/templates.pot debian/rules debian/shlibs.local
        debian/watch i18n.h indent_script m4/acx_pthread.m4
        m4/fexception.m4 m4/iconv_translit.m4 m4/localeworks.m4
        m4/pcre.m4 m4/sqlite.m4 m4/xgettextflag.m4 mkstemp.hh
        monotone.spec package_full_revision.h package_revision.h
        po/POTFILES.in po/POTFILES.skip po/remove-potcdate.sin
        tests/importing_cvs_tricky_repo_with_tags/test.manifest
        tests/importing_cvs_tricky_repo_with_tags/test.tags
        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
Renamed entries:
        botan to Attic/botan
        crypto_tests.cc to unit-tests/sha1.cc
        diff_patch.cc to diff_output.cc
        diff_patch.hh to diff_output.hh
        idna to Attic/idna
        lua to Attic/lua
        merge.cc to merge_content.cc
        merge.hh to merge_content.hh
        numeric_vocab.cc to unit-tests/numeric_vocab.cc
        pcre to Attic/pcre
        pcre/pcrepattern.texi to pcrepattern.texi
        pcre/pcresyntax.texi to pcresyntax.texi
        roster_merge.cc to merge_roster.cc
        roster_merge.hh to merge_roster.hh
        schema_migration.cc to migrate_schema.cc
        schema_migration.hh to migration.hh
        sha1.hh to Attic/sha1.hh
        sha1_engine.hh to Attic/sha1_engine.hh
        sqlite to Attic/sqlite
        string_queue.cc to unit-tests/string_queue.cc
        tests/--no-workspace to tests/_--no-workspace
        tests/resolve_duplicate_name_conflict to 
tests/resolve_conflicts_duplicate_name
        unit_tests.cc to unit_tester.cc
        unix/tester-check-net.c to unix/tester-check-net.cc
        win32/tester-check-net.c to win32/tester-check-net.cc
        work_migration.cc to migrate_work.cc
Added files:
        ancestry.cc automate_ostream.hh automate_ostream_demuxed.hh
        automate_reader.cc automate_reader.hh cmd.cc
        cmd_conflicts.cc contrib/command/remote_export.lua
        contrib/display_branches.lua git_change.cc git_change.hh
        git_export.cc git_export.hh images/bg.png images/go-next.png
        images/go-previous.png images/go-up.png images/toc.png
        lazy_rng.hh m4/library.m4 m4/mtn-gettext.m4 merge_3way.cc
        merge_conflict.cc migrate_ancestry.cc
        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
        origin_type.hh roster_tests.hh
        tester-tests/running_commands/__driver__.lua
        tester-tests/running_commands/script
        tests/attr_mtn_execute/__driver__.lua
        tests/attr_set_drop/__driver__.lua
        tests/automate_file_merge/__driver__.lua
        tests/automate_lua/__driver__.lua
        tests/automate_lua/test.lua
        tests/automate_stdio_band_output/__driver__.lua
        tests/bisect/__driver__.lua
        tests/bisect_blocked/__driver__.lua
        tests/bisect_linear/__driver__.lua
        tests/clobbered_attrs/__driver__.lua
        tests/commit_default_editor/__driver__.lua
        tests/commit_default_editor/test_hooks.lua
        tests/common/automate_stdio.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/delta_directions/__driver__.lua
        tests/diagnostics_with--timestamps/__driver__.lua
        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/git_export/__driver__.lua
        tests/git_export_rename_loop/__driver__.lua
        tests/importing_cvs_attic_duplicate/__driver__.lua
        tests/importing_cvs_attic_duplicate/cvs-repository/test/Attic/foo,v
        tests/importing_cvs_attic_duplicate/cvs-repository/test/foo,v
        tests/importing_cvs_attic_duplicate/makerepo.sh
        tests/importing_cvs_branch_from_empty_branch/__driver__.lua
        tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileA,v
        tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileB,v
        tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileC,v
        tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileD,v
        tests/importing_cvs_branch_from_empty_branch/makerepo.sh
        tests/importing_cvs_branches2/__driver__.lua
        tests/importing_cvs_branches2/cvs-repository/test/Attic/file3,v
        tests/importing_cvs_branches2/cvs-repository/test/changelog,v
        tests/importing_cvs_branches2/cvs-repository/test/file1,v
        tests/importing_cvs_branches2/cvs-repository/test/file2,v
        tests/importing_cvs_branches2/makerepo.sh
        tests/importing_cvs_branches3/__driver__.lua
        tests/importing_cvs_branches3/cvs-repository/test/file1,v
        tests/importing_cvs_branches3/cvs-repository/test/file2,v
        tests/importing_cvs_branches3/makerepo.sh
        tests/importing_cvs_branches4/__driver__.lua
        tests/importing_cvs_branches4/cvs-repository/test/file1,v
        tests/importing_cvs_branches4/cvs-repository/test/file2,v
        tests/importing_cvs_branches4/makerepo.sh
        tests/importing_cvs_branches5/__driver__.lua
        tests/importing_cvs_branches5/cvs-repository/test/file1,v
        tests/importing_cvs_branches5/cvs-repository/test/file2,v
        tests/importing_cvs_branches5/makerepo.sh
        tests/importing_cvs_branches6/__driver__.lua
        tests/importing_cvs_branches6/cvs-repository/test/file1,v
        tests/importing_cvs_branches6/cvs-repository/test/file2,v
        tests/importing_cvs_branches7/__driver__.lua
        tests/importing_cvs_branches7/cvs-repository/test/file1,v
        tests/importing_cvs_branches7/makerepo.sh
        tests/importing_cvs_cycle_splitter1/__driver__.lua
        tests/importing_cvs_cycle_splitter1/cvs-repository/test/bar,v
        tests/importing_cvs_cycle_splitter1/cvs-repository/test/foo,v
        tests/importing_cvs_cycle_splitter1/makerepo.sh
        tests/importing_cvs_cycle_splitter2/__driver__.lua
        tests/importing_cvs_cycle_splitter2/cvs-repository/test/bar,v
        tests/importing_cvs_cycle_splitter2/cvs-repository/test/foo,v
        tests/importing_cvs_cycle_splitter3/__driver__.lua
        tests/importing_cvs_cycle_splitter3/cvs-repository/test/file1,v
        tests/importing_cvs_cycle_splitter3/cvs-repository/test/file2,v
        tests/importing_cvs_cycle_splitter4/__driver__.lua
        tests/importing_cvs_cycle_splitter4/cvs-repository/test/file1,v
        tests/importing_cvs_cycle_splitter4/cvs-repository/test/file2,v
        tests/importing_cvs_cycle_splitter4/cvs-repository/test/file3,v
        tests/importing_cvs_cycle_splitter5/__driver__.lua
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1b,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1c,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2b,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2c,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3b,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3c,v
        tests/importing_cvs_cycle_splitter6/__driver__.lua
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file1,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file1b,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file1c,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file2,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file2b,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file2c,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file3,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file3b,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file3c,v
        tests/importing_cvs_dryrun/__driver__.lua
        tests/importing_cvs_dryrun/cvs-repository/test/foo,v
        tests/importing_cvs_dryrun/makerepo.sh
        tests/importing_cvs_files_charset/__driver__.lua
        tests/importing_cvs_files_charset/cvs-repository/test/foo,v
        tests/importing_cvs_files_charset/makerepo.sh
        tests/importing_cvs_files_with_identical_logs2/__driver__.lua
        tests/importing_cvs_files_with_identical_logs2/cvs-repository/test/foo,v
        tests/importing_cvs_files_with_identical_logs2/makerepo.sh
        tests/importing_cvs_files_with_identical_logs3/__driver__.lua
        tests/importing_cvs_files_with_identical_logs3/cvs-repository/test/foo,v
        tests/importing_cvs_files_with_identical_logs3/makerepo.sh
        tests/importing_cvs_files_with_identical_time/__driver__.lua
        tests/importing_cvs_files_with_identical_time/cvs-repository/test/foo,v
        tests/importing_cvs_ignore_symbol/__driver__.lua
        tests/importing_cvs_ignore_symbol/cvs-repository/test/foo,v
        tests/importing_cvs_ignore_symbol/ignhook.lua
        tests/importing_cvs_ignore_symbol/makerepo.sh
        tests/importing_cvs_metadata/__driver__.lua
        tests/importing_cvs_metadata/cvs-repository/test/test.txt,v
        tests/importing_cvs_metadata/expected_log_output
        tests/importing_cvs_missing_delta_1/__driver__.lua
        tests/importing_cvs_missing_delta_1/cvs-repository/fileA,v
        tests/importing_cvs_missing_delta_2/__driver__.lua
        tests/importing_cvs_missing_delta_2/cvs-repository/test/foo,v
        tests/importing_cvs_successive/__driver__.lua
        tests/importing_cvs_successive/cvs-repository/test/file1,v
        tests/importing_cvs_successive/cvs-repository/test/file2,v
        tests/importing_cvs_successive/cvs-repository-snap/test/file1,v
        tests/importing_cvs_successive/cvs-repository-snap/test/file2,v
        tests/importing_cvs_successive/makerepo.sh
        tests/importing_cvs_timing_check/__driver__.lua
        tests/importing_cvs_timing_check/cvs-repository/test/bar,v
        tests/importing_cvs_timing_check/cvs-repository/test/foo,v
        tests/importing_cvs_timing_check/makerepo.sh
        tests/importing_cvs_with_conflicting_tag/__driver__.lua
        tests/importing_cvs_with_conflicting_tag/cvs-repository/testsrc/fileA,v
        tests/importing_cvs_with_conflicting_tag/cvs-repository/testsrc/fileB,v
        tests/importing_cvs_with_conflicting_tag2/__driver__.lua
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileA,v
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileB,v
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileC,v
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileD,v
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileE,v
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileF,v
        tests/importing_cvs_with_conflicting_tag2/makerepo.sh
        tests/importing_cvs_with_conflicting_tag3/__driver__.lua
        tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file1,v
        tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file2,v
        tests/importing_cvs_with_conflicting_tag3/makerepo.sh
        tests/importing_cvs_with_multiple_unnamed_branches/__driver__.lua
        
tests/importing_cvs_with_multiple_unnamed_branches/cvs-repository/fileA,v
        tests/importing_cvs_with_multiple_vendor_imports/__driver__.lua
        
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileA,v
        
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileB,v
        
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileC,v
        tests/importing_cvs_with_multiple_vendor_imports/makerepo.sh
        tests/importing_cvs_with_multiple_vendor_imports2/__driver__.lua
        
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileA,v
        
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileB,v
        
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileC,v
        tests/importing_cvs_with_multiple_vendor_imports2/makerepo.sh
        tests/importing_cvs_with_tags_after_delete/__driver__.lua
        
tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic/bar,v
        tests/importing_cvs_with_tags_after_delete/cvs-repository/test/foo,v
        tests/importing_cvs_with_tags_after_delete/makerepo.sh
        tests/importing_cvs_with_tags_after_delete2/__driver__.lua
        
tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/Attic/bar,v
        tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/foo,v
        tests/importing_cvs_with_unnamed_branch/__driver__.lua
        tests/importing_cvs_with_unnamed_branch/cvs-repository/fileA,v
        tests/in_memory_database/__driver__.lua
        tests/invalid__MTN_options/__driver__.lua
        tests/log_from_to_revision/__driver__.lua
        tests/m_selector/__driver__.lua
        tests/merge_into_workspace_mtn_execute/__driver__.lua
        tests/move_conflicting_unversioned/__driver__.lua
        tests/netsync_negotiation/__driver__.lua
        tests/netsync_negotiation/netsync6.lua
        tests/noop_merge_into_workspace/__driver__.lua
        tests/pluck_mtn_execute/__driver__.lua
        tests/resolve_conflicts_all_merge_commands/__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/merge3_hook.lua
        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-gui_left
        tests/resolve_conflicts_all_resolutions/show_first-gui_right
        tests/resolve_conflicts_all_resolutions/show_first-interactive
        tests/resolve_conflicts_all_resolutions/show_first-thermostat
        tests/resolve_conflicts_all_resolutions/show_first-user
        tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
        tests/resolve_conflicts_all_resolutions/show_remaining-gui_left
        tests/resolve_conflicts_all_resolutions/show_remaining-thermostat
        tests/resolve_conflicts_content/__driver__.lua
        tests/resolve_conflicts_content/conflicts-1
        tests/resolve_conflicts_content/conflicts-2
        tests/resolve_conflicts_content/merge-1
        tests/resolve_conflicts_content/update-1
        tests/resolve_conflicts_duplicate_name/conflicts-1
        tests/resolve_conflicts_duplicate_name/conflicts-resolved
        tests/resolve_conflicts_duplicate_name/merge-1
        tests/resolve_conflicts_duplicate_name_directory/__driver__.lua
        tests/resolve_conflicts_errors/__driver__.lua
        tests/resolve_conflicts_errors/conflicts-attr-show-1
        tests/resolve_conflicts_errors/conflicts-attr-show-2
        tests/resolve_conflicts_errors/conflicts-attr-store-1
        tests/resolve_conflicts_errors/conflicts-attr-store-2
        tests/resolve_conflicts_errors/merge-old-conflicts-file
        tests/resolve_conflicts_multiple_names/__driver__.lua
        tests/resolve_conflicts_none/__driver__.lua
        tests/resolve_conflicts_none/conflicts-1
        tests/resolve_conflicts_none/merge-1
        tests/resolve_conflicts_none/update-1
        tests/resolve_conflicts_orphaned_file/__driver__.lua
        tests/resolve_conflicts_propagate/__driver__.lua
        tests/resolve_conflicts_propagate/conflicts-1
        tests/resolve_conflicts_propagate/conflicts-2
        tests/resolve_conflicts_propagate/conflicts-resolved
        tests/resolve_conflicts_propagate/propagate-1
        tests/resolve_conflicts_propagate/propagate-2
        tests/resolve_conflicts_read_all/__driver__.lua
        tests/resolve_conflicts_read_all/attribute-attached_left
        tests/resolve_conflicts_read_all/attribute-attached_right
        tests/resolve_conflicts_read_all/attribute-detached_left
        tests/resolve_conflicts_read_all/attribute-detached_right
        tests/resolve_conflicts_read_all/content-attached_left
        tests/resolve_conflicts_read_all/content-attached_right
        tests/resolve_conflicts_read_all/content-detached_left
        tests/resolve_conflicts_read_all/content-detached_right
        tests/resolve_conflicts_read_all/directory-loop_left
        tests/resolve_conflicts_read_all/directory-loop_right
        tests/resolve_conflicts_read_all/duplicate-add-rename_left
        tests/resolve_conflicts_read_all/duplicate-add-rename_right
        tests/resolve_conflicts_read_all/duplicate-adds_left
        tests/resolve_conflicts_read_all/duplicate-adds_right
        
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_left
        
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_right
        tests/resolve_conflicts_read_all/duplicate-renames_left
        tests/resolve_conflicts_read_all/duplicate-renames_right
        tests/resolve_conflicts_read_all/invalid-add_left
        tests/resolve_conflicts_read_all/invalid-add_right
        tests/resolve_conflicts_read_all/invalid-rename_left
        tests/resolve_conflicts_read_all/invalid-rename_right
        tests/resolve_conflicts_read_all/missing-root_left
        tests/resolve_conflicts_read_all/missing-root_right
        tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_left
        tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_right
        tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_left
        tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_right
        tests/resolve_conflicts_read_all/multiple-name-plus-orphan_left
        tests/resolve_conflicts_read_all/multiple-name-plus-orphan_right
        tests/resolve_conflicts_read_all/multiple-names_left
        tests/resolve_conflicts_read_all/multiple-names_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/resolve_conflicts_read_all/unrelated-projects_left
        tests/resolve_conflicts_read_all/unrelated-projects_right
        tests/revert_attrs/__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/schema_migration/9c8d5a9ea8e29c69be6459300982a68321b0ec12.mtn.dumped
        tests/serve-automate/__driver__.lua
        tests/serve-automate-single-run/__driver__.lua
        tests/skip_invalid_paths/__driver__.lua
        tests/u_selector/__driver__.lua
        tests/update_loses_execute/__driver__.lua
        tests/w_selector/__driver__.lua unit-tests/basic_io.cc
        unit-tests/charset.cc unit-tests/commands.cc
        unit-tests/cset.cc unit-tests/dates.cc
        unit-tests/git_change.cc unit-tests/globish.cc
        unit-tests/graph.cc unit-tests/merge_3way.cc
        unit-tests/merge_roster.cc unit-tests/mkstemp.cc
        unit-tests/netcmd.cc unit-tests/netxx_pipe.cc
        unit-tests/option.cc unit-tests/outdated_indicator.cc
        unit-tests/packet.cc unit-tests/paths.cc
        unit-tests/refiner.cc unit-tests/restrictions.cc
        unit-tests/rev_height.cc unit-tests/revision.cc
        unit-tests/roster.cc unit-tests/simplestring_xform.cc
        unit-tests/transforms.cc unit-tests/uri.cc
        unit-tests/vocab.cc unit-tests/xdelta.cc
Added directories:
        Attic images network tester-tests/running_commands
        tests/attr_mtn_execute tests/attr_set_drop
        tests/automate_file_merge tests/automate_lua
        tests/automate_stdio_band_output tests/bisect
        tests/bisect_blocked tests/bisect_linear
        tests/clobbered_attrs tests/commit_default_editor
        tests/date_formatting tests/db_fix_certs
        tests/delta_directions tests/diagnostics_with--timestamps
        tests/diff_reverse tests/exception-in-luaext
        tests/git_export tests/git_export_rename_loop
        tests/importing_cvs_attic_duplicate
        tests/importing_cvs_attic_duplicate/cvs-repository
        tests/importing_cvs_attic_duplicate/cvs-repository/test
        tests/importing_cvs_attic_duplicate/cvs-repository/test/Attic
        tests/importing_cvs_branch_from_empty_branch
        tests/importing_cvs_branch_from_empty_branch/cvs-repository
        tests/importing_cvs_branch_from_empty_branch/cvs-repository/test
        tests/importing_cvs_branches2
        tests/importing_cvs_branches2/cvs-repository
        tests/importing_cvs_branches2/cvs-repository/test
        tests/importing_cvs_branches2/cvs-repository/test/Attic
        tests/importing_cvs_branches3
        tests/importing_cvs_branches3/cvs-repository
        tests/importing_cvs_branches3/cvs-repository/test
        tests/importing_cvs_branches4
        tests/importing_cvs_branches4/cvs-repository
        tests/importing_cvs_branches4/cvs-repository/test
        tests/importing_cvs_branches5
        tests/importing_cvs_branches5/cvs-repository
        tests/importing_cvs_branches5/cvs-repository/test
        tests/importing_cvs_branches6
        tests/importing_cvs_branches6/cvs-repository
        tests/importing_cvs_branches6/cvs-repository/test
        tests/importing_cvs_branches7
        tests/importing_cvs_branches7/cvs-repository
        tests/importing_cvs_branches7/cvs-repository/test
        tests/importing_cvs_cycle_splitter1
        tests/importing_cvs_cycle_splitter1/cvs-repository
        tests/importing_cvs_cycle_splitter1/cvs-repository/test
        tests/importing_cvs_cycle_splitter2
        tests/importing_cvs_cycle_splitter2/cvs-repository
        tests/importing_cvs_cycle_splitter2/cvs-repository/test
        tests/importing_cvs_cycle_splitter3
        tests/importing_cvs_cycle_splitter3/cvs-repository
        tests/importing_cvs_cycle_splitter3/cvs-repository/test
        tests/importing_cvs_cycle_splitter4
        tests/importing_cvs_cycle_splitter4/cvs-repository
        tests/importing_cvs_cycle_splitter4/cvs-repository/test
        tests/importing_cvs_cycle_splitter5
        tests/importing_cvs_cycle_splitter5/cvs-repository
        tests/importing_cvs_cycle_splitter5/cvs-repository/test
        tests/importing_cvs_cycle_splitter6
        tests/importing_cvs_cycle_splitter6/cvs-repository
        tests/importing_cvs_cycle_splitter6/cvs-repository/test
        tests/importing_cvs_dryrun
        tests/importing_cvs_dryrun/cvs-repository
        tests/importing_cvs_dryrun/cvs-repository/test
        tests/importing_cvs_files_charset
        tests/importing_cvs_files_charset/cvs-repository
        tests/importing_cvs_files_charset/cvs-repository/test
        tests/importing_cvs_files_with_identical_logs2
        tests/importing_cvs_files_with_identical_logs2/cvs-repository
        tests/importing_cvs_files_with_identical_logs2/cvs-repository/test
        tests/importing_cvs_files_with_identical_logs3
        tests/importing_cvs_files_with_identical_logs3/cvs-repository
        tests/importing_cvs_files_with_identical_logs3/cvs-repository/test
        tests/importing_cvs_files_with_identical_time
        tests/importing_cvs_files_with_identical_time/cvs-repository
        tests/importing_cvs_files_with_identical_time/cvs-repository/test
        tests/importing_cvs_ignore_symbol
        tests/importing_cvs_ignore_symbol/cvs-repository
        tests/importing_cvs_ignore_symbol/cvs-repository/test
        tests/importing_cvs_metadata
        tests/importing_cvs_metadata/cvs-repository
        tests/importing_cvs_metadata/cvs-repository/test
        tests/importing_cvs_missing_delta_1
        tests/importing_cvs_missing_delta_1/cvs-repository
        tests/importing_cvs_missing_delta_2
        tests/importing_cvs_missing_delta_2/cvs-repository
        tests/importing_cvs_missing_delta_2/cvs-repository/test
        tests/importing_cvs_successive
        tests/importing_cvs_successive/cvs-repository
        tests/importing_cvs_successive/cvs-repository/test
        tests/importing_cvs_successive/cvs-repository-snap
        tests/importing_cvs_successive/cvs-repository-snap/test
        tests/importing_cvs_timing_check
        tests/importing_cvs_timing_check/cvs-repository
        tests/importing_cvs_timing_check/cvs-repository/test
        tests/importing_cvs_with_conflicting_tag
        tests/importing_cvs_with_conflicting_tag/cvs-repository
        tests/importing_cvs_with_conflicting_tag/cvs-repository/testsrc
        tests/importing_cvs_with_conflicting_tag2
        tests/importing_cvs_with_conflicting_tag2/cvs-repository
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test
        tests/importing_cvs_with_conflicting_tag3
        tests/importing_cvs_with_conflicting_tag3/cvs-repository
        tests/importing_cvs_with_conflicting_tag3/cvs-repository/test
        tests/importing_cvs_with_multiple_unnamed_branches
        tests/importing_cvs_with_multiple_unnamed_branches/cvs-repository
        tests/importing_cvs_with_multiple_vendor_imports
        tests/importing_cvs_with_multiple_vendor_imports/cvs-repository
        tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test
        tests/importing_cvs_with_multiple_vendor_imports2
        tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository
        tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test
        tests/importing_cvs_with_tags_after_delete
        tests/importing_cvs_with_tags_after_delete/cvs-repository
        tests/importing_cvs_with_tags_after_delete/cvs-repository/test
        tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic
        tests/importing_cvs_with_tags_after_delete2
        tests/importing_cvs_with_tags_after_delete2/cvs-repository
        tests/importing_cvs_with_tags_after_delete2/cvs-repository/test
        tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/Attic
        tests/importing_cvs_with_unnamed_branch
        tests/importing_cvs_with_unnamed_branch/cvs-repository
        tests/in_memory_database tests/invalid__MTN_options
        tests/log_from_to_revision tests/m_selector
        tests/merge_into_workspace_mtn_execute
        tests/move_conflicting_unversioned tests/netsync_negotiation
        tests/noop_merge_into_workspace tests/pluck_mtn_execute
        tests/resolve_conflicts_all_merge_commands
        tests/resolve_conflicts_all_resolutions
        tests/resolve_conflicts_content
        tests/resolve_conflicts_duplicate_name_directory
        tests/resolve_conflicts_errors
        tests/resolve_conflicts_multiple_names
        tests/resolve_conflicts_none
        tests/resolve_conflicts_orphaned_file
        tests/resolve_conflicts_propagate
        tests/resolve_conflicts_read_all tests/revert_attrs
        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/u_selector tests/update_loses_execute tests/w_selector
        unit-tests
Modified files:
        .mtn-ignore AUTHORS Attic/botan/README.botan-monotone
        Attic/lua/luaconf.h Attic/sha1_engine.hh HACKING INSTALL
        Makefile.am NEWS UPGRADE adler32.hh annotate.cc annotate.hh
        app_state.cc app_state.hh asciik.cc asciik.hh audit-includes
        automate.cc base.hh basic_io.cc basic_io.hh
        botan_pipe_cache.hh cert.cc cert.hh char_classifiers.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
        configure.ac constants.hh contrib/ciabot_monotone.py
        contrib/command/init.lua
        contrib/get_passphrase_from_file.lua
        contrib/monotone-mail-notify.sh cset.cc cset.hh
        current_exception.hh cycle_detector.hh database.cc
        database.hh database_check.cc dates.cc dates.hh
        diff_output.cc diff_output.hh do-editor-vars.sh
        enumerator.cc enumerator.hh epoch.cc epoch.hh file_io.cc
        file_io.hh gettext.h globish.cc globish.hh graph.cc graph.hh
        gzip.cc gzip.hh hash_map.hh hmac.cc hmac.hh hybrid_map.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 lexical_cast.hh lru_writeback_cache.hh
        lua-testsuite.lua lua.cc lua.hh lua_hooks.cc lua_hooks.hh
        luaext_globish.cc luaext_guess_binary.cc luaext_mkstemp.cc
        luaext_parse_basic_io.cc luaext_platform.cc m4/boost.m4
        m4/inaddrnone.m4 m4/netxx.m4 m4/numeric_vocab.m4 m4/pkg.m4
        m4/stlporthashmap.m4 m4/syncwithstdio.m4 m4/tempstatconst.m4
        m4/typeof.m4 merge_content.cc merge_content.hh
        merge_roster.cc merge_roster.hh merkle_tree.cc
        merkle_tree.hh migrate_schema.cc migrate_work.cc
        migration.hh mkstemp.cc monotone.cc monotone.texi
        mt_version.cc mt_version.hh mtn-sanity.cc mtn-sanity.hh
        netcmd.cc netcmd.hh netio.hh netsync.cc netxx_pipe.cc
        netxx_pipe.hh notes/release-checklist.txt numeric_vocab.hh
        option.cc option.hh options.cc options.hh options_list.hh
        outdated_indicator.cc outdated_indicator.hh packet.cc
        packet.hh parallel_iter.hh paths.cc paths.hh pch.hh
        pcrewrap.cc pcrewrap.hh platform-wrapped.hh platform.hh
        po/LINGUAS po/Makevars po/README po/de.po po/es.po po/fr.po
        po/it.po po/sv.po project.cc project.hh quick_alloc.hh
        randomfile.hh randomizer.cc randomizer.hh rcs_file.cc
        rcs_file.hh rcs_import.cc rcs_import.hh refiner.cc
        refiner.hh restrictions.cc restrictions.hh rev_height.cc
        rev_height.hh rev_types.hh revision.cc revision.hh roster.cc
        roster.hh roster_delta.cc roster_delta.hh safe_map.hh
        sanity.cc sanity.hh schema.sql selectors.cc selectors.hh
        sha1.cc simplestring_xform.cc simplestring_xform.hh
        ssh_agent.cc ssh_agent.hh std_hooks.lua string_queue.hh
        tester-plaf.hh 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-tests/remove-unwriteable/__driver__.lua
        tester-testsuite.lua tester.cc testlib.lua
        tests/_MTN_case-folding_security_patch/__driver__.lua
        tests/attr_set_get_commands/__driver__.lua
        tests/automate_cert/__driver__.lua
        tests/automate_cert/expected tests/automate_certs/expected
        tests/automate_content_diff/__driver__.lua
        tests/automate_get_attributes/__driver__.lua
        tests/automate_get_current_revision/__driver__.lua
        tests/automate_get_options/__driver__.lua
        tests/automate_heads/__driver__.lua
        tests/automate_identify/__driver__.lua
        tests/automate_inventory_options/__driver__.lua
        tests/automate_inventory_options/test_hooks.lua
        tests/automate_keys/__driver__.lua
        tests/automate_set_drop_attribute/__driver__.lua
        tests/automate_show_conflicts/__driver__.lua
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/automate_show_conflicts/expected-directory-loop.stdout
        tests/automate_show_conflicts_defaults/__driver__.lua
        tests/automate_stdio/__driver__.lua
        tests/automate_stdio_options/__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_validation_lua_hook/__driver__.lua
        tests/commit_with_--message-file/__driver__.lua
        tests/common/netsync-hooks_with_notes.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/defecting_attributes/__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/dump_on_crash/__driver__.lua
        tests/duplicate_key_id/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/empty_string_as_a_path_name/__driver__.lua
        tests/fail_cleanly_on_unreadable_db/__driver__.lua
        tests/generating_and_extracting_keys_and_certs/__driver__.lua
        tests/importing_cvs_branches/__driver__.lua
        tests/importing_cvs_problematic_repo/__driver__.lua
        tests/importing_cvs_small_real_repo/test.manifest
        tests/importing_cvs_tricky_repo_with_tags/__driver__.lua
        tests/importing_files_with_non-english_names/__driver__.lua
        tests/inventory_hooks.lua
        tests/key_files_created_securely/__driver__.lua
        tests/log_--last=N_--next=N/__driver__.lua
        tests/log_--last=N_FILENAME/__driver__.lua
        tests/log_dir/__driver__.lua
        tests/log_with_restriction/__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/quiet_turns_off_tickers_but_not_warnings/__driver__.lua
        tests/read_and_convert_old_privkey_packet/__driver__.lua
        tests/resolve_conflicts_duplicate_name/__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/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/unnormalized_paths_in_database/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc
        tests/wrong_options_override_workspace_options/__driver__.lua
        texinfo.css transforms.cc transforms.hh txt2c.cc ui.cc ui.hh
        unit-tests/numeric_vocab.cc unit-tests/sha1.cc
        unit-tests/string_queue.cc unit-testsuite.lua unit_tester.cc
        unit_tests.hh unix/cputime.cc unix/fs.cc
        unix/get_system_flavour.cc unix/inodeprint.cc unix/main.cc
        unix/make_io_binary.cc unix/os_strerror.cc unix/process.cc
        unix/read_password.cc unix/ssh_agent_platform.cc
        unix/ssh_agent_platform.hh unix/terminal.cc
        unix/tester-check-net.cc unix/tester-plaf.cc update.cc
        update.hh uri.cc uri.hh util/mtnopt.in vector.hh
        visualc/config.h vocab.cc vocab.hh vocab_cast.hh
        vocab_hash.hh vocab_macros.hh vocab_terms.hh win32/README
        win32/cputime.cc win32/fs.cc win32/get_system_flavour.cc
        win32/inodeprint.cc win32/main.cc win32/make_io_binary.cc
        win32/monotone.iss win32/os_strerror.cc win32/process.cc
        win32/read_password.cc win32/ssh_agent_platform.cc
        win32/ssh_agent_platform.hh win32/terminal.cc
        win32/tester-check-net.cc win32/tester-plaf.cc work.cc
        work.hh xdelta.cc xdelta.hh
Modified attrs:
        images/bg.png images/go-next.png images/go-previous.png
        images/go-up.png images/toc.png
        tests/automate_stdio_band_output/__driver__.lua
        tests/db_fix_certs/generate-db.sh
        tests/db_fix_certs/test.mtn
        tests/importing_cvs_attic_duplicate/makerepo.sh
        tests/importing_cvs_branch_from_empty_branch/makerepo.sh
        tests/importing_cvs_branches2/makerepo.sh
        tests/importing_cvs_branches3/makerepo.sh
        tests/importing_cvs_branches4/makerepo.sh
        tests/importing_cvs_branches5/makerepo.sh
        tests/importing_cvs_branches7/makerepo.sh
        tests/importing_cvs_cycle_splitter1/makerepo.sh
        tests/importing_cvs_dryrun/makerepo.sh
        tests/importing_cvs_files_charset/makerepo.sh
        tests/importing_cvs_files_with_identical_logs2/makerepo.sh
        tests/importing_cvs_files_with_identical_logs3/makerepo.sh
        tests/importing_cvs_ignore_symbol/makerepo.sh
        tests/importing_cvs_successive/makerepo.sh
        tests/importing_cvs_timing_check/makerepo.sh
        tests/importing_cvs_with_conflicting_tag2/makerepo.sh
        tests/importing_cvs_with_conflicting_tag3/makerepo.sh
        tests/importing_cvs_with_multiple_vendor_imports/makerepo.sh
        tests/importing_cvs_with_multiple_vendor_imports2/makerepo.sh
        tests/importing_cvs_with_tags_after_delete/makerepo.sh
        tests/resolve_conflicts_errors/__driver__.lua
        tests/resolve_conflicts_errors/conflicts-attr-store-1
        util/mtnopt.in

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
3059e5823903e47e0b2926a067f01c19faaf484b)
            to branch 'net.venge.monotone.cvsimport-branch-reconstruction' 
(head 3f7b29b395be4f02671a84437c9a8450e8afd075)


monotone --db={your.database} diff 
--revision=3059e5823903e47e0b2926a067f01c19faaf484b 
--revision=64001650a3aa556bfabc28224955c048057416df
monotone --db={your.database} diff 
--revision=3f7b29b395be4f02671a84437c9a8450e8afd075 
--revision=64001650a3aa556bfabc28224955c048057416df
----------------------------------------------------------------------