[Monotone-commits-diffs] Revision 140a485f45c88d605aff2fdb2d60ff402f676dbb

[monotone]

-----------------------------------------------------------------
Revision: 140a485f45c88d605aff2fdb2d60ff402f676dbb
Ancestor: 4ac045d2fb7b8c9dd2a4106ae38296d8b5d7cc3c
Ancestor: b96a773248d501c63c03fd7b5210f4bf88b57ffa
Author: address@hidden
Date: 2008-03-11T23:21:23
Branch: net.venge.monotone.cvssync.refactor

Deleted entries:
        botan/es_file.cpp botan/es_file.h botan/inifile.cpp
        database_check.hh test_hooks.lua
        tests/automate_get_revision/expected2
        tests/common/automate_ancestry.lua
        tests/common/netsync-hooks.lua
        tests/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua tests/common/selectors.lua
        tests/database_is_closed_on_signal_exit
        tests/database_is_closed_on_signal_exit/__driver__.lua
        tests/log_quits_on_SIGPIPE/hookfile
Added files:
        botan/es_dev.cpp botan/es_dev.h char_classifiers.hh
        debian/shlibs.local 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_add_drop/__driver__.lua
        mtn_cvs/tests/push_loop/__driver__.lua
        mtn_cvs/tests/push_pull_with_changes/__driver__.lua
        mtn_cvs/tests/push_rename/__driver__.lua
        mtn_cvs/tests/push_rename_and_change/__driver__.lua
        mtn_cvs/tests/push_simple/__driver__.lua
        mtn_cvs/tests/takeover_basic/__driver__.lua
        mtn_cvs/tests/takeover_modified/__driver__.lua
        mtn_cvs/tests/test_hooks.lua mtn_cvs/tests/test_keys
        mtn_cvs/testsuite.lua rev_types.hh
        tests/automate_get_current_revision/__driver__.lua
        tests/automate_sync_info/__driver__.lua
        tests/commit_use_workspace_keydir/__driver__.lua
        tests/diff_on_missing_trailing_newline_at_end_of_file/__driver__.lua
        tests/diff_on_missing_trailing_newline_at_end_of_file/file1
        tests/diff_on_missing_trailing_newline_at_end_of_file/file13.diff
        tests/diff_on_missing_trailing_newline_at_end_of_file/file14.diff
        tests/diff_on_missing_trailing_newline_at_end_of_file/file2
        tests/diff_on_missing_trailing_newline_at_end_of_file/file23.diff
        tests/diff_on_missing_trailing_newline_at_end_of_file/file24.diff
        tests/diff_on_missing_trailing_newline_at_end_of_file/file3
        tests/diff_on_missing_trailing_newline_at_end_of_file/file4
        tests/non_workspace_keydir/__driver__.lua
        tests/signature_round_trip/__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_add_drop
        mtn_cvs/tests/push_loop mtn_cvs/tests/push_pull_with_changes
        mtn_cvs/tests/push_rename
        mtn_cvs/tests/push_rename_and_change
        mtn_cvs/tests/push_simple mtn_cvs/tests/takeover_basic
        mtn_cvs/tests/takeover_modified
        tests/automate_get_current_revision tests/automate_sync_info
        tests/commit_use_workspace_keydir
        tests/diff_on_missing_trailing_newline_at_end_of_file
        tests/non_workspace_keydir tests/signature_round_trip
Modified files:
        .mtn-ignore AUTHORS HACKING Makefile.am NEWS UPGRADE
        annotate.cc annotate.hh app_state.cc app_state.hh asciik.cc
        asciik.hh automate.cc base.hh basic_io.cc basic_io.hh
        boost/circular_buffer_base.hpp botan/README.botan-monotone
        botan/aes.cpp botan/allocate.h botan/asn1_alt.cpp
        botan/asn1_ku.cpp botan/asn1_obj.h botan/ber_dec.cpp
        botan/big_base.cpp botan/big_ops2.cpp botan/bit_ops.cpp
        botan/bit_ops.h botan/buf_es.cpp botan/build.h
        botan/crc32.cpp botan/credits.txt botan/defalloc.cpp
        botan/defalloc.h botan/der_enc.cpp botan/des.cpp
        botan/dsa_gen.cpp botan/es_egd.cpp botan/hex.cpp
        botan/init.h botan/init_def.cpp botan/init_opt.cpp
        botan/kdf.cpp botan/libstate.cpp botan/mdx_hash.cpp
        botan/mem_pool.cpp botan/mgf1.cpp botan/modules.cpp
        botan/mp_mul.cpp botan/parsing.cpp botan/parsing.h
        botan/pkcs5.cpp botan/policy.cpp botan/prf_x942.cpp
        botan/pubkey.cpp botan/randpool.cpp botan/reducer.cpp
        botan/sha160.cpp botan/sha256.cpp botan/x509cert.cpp
        botan/x509self.cpp botan/x509self.h cert.cc cert.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
        configure.ac contrib/monotone.bash_completion cset.hh
        database.cc database.hh database_check.cc debian/changelog
        debian/control debian/rules diff_patch.cc diff_patch.hh
        enumerator.cc enumerator.hh globish.cc graph.cc graph.hh
        gzip.cc hybrid_map.hh inodeprint.cc inodeprint.hh
        key_store.cc key_store.hh keys.cc keys.hh legacy.cc
        legacy.hh lua-testsuite.lua lua.cc lua_hooks.cc lua_hooks.hh
        m4/pcre.m4 merge.cc merge.hh monotone.cc monotone.spec
        monotone.texi netcmd.cc netcmd.hh netsync.cc netxx_pipe.cc
        options_list.hh packet.cc packet.hh pcre/pcre.h
        pcre/pcre_compile.c pcre/pcre_config.c pcre/pcre_dfa_exec.c
        pcre/pcre_exec.c pcre/pcre_fullinfo.c pcre/pcre_get.c
        pcre/pcre_globals.c pcre/pcre_info.c pcre/pcre_internal.h
        pcre/pcre_maketables.c pcre/pcre_newline.c
        pcre/pcre_ord2utf8.c pcre/pcre_refcount.c pcre/pcre_study.c
        pcre/pcre_tables.c pcre/pcre_try_flipped.c
        pcre/pcre_ucp_searchfuncs.c pcre/pcre_valid_utf8.c
        pcre/pcre_version.c pcre/pcre_xclass.c pcre/pcresyntax.texi
        pcre/ucptable.h platform.hh po/de.po po/es.po po/it.po
        po/sv.po project.cc project.hh rcs_file.cc rcs_import.cc
        rcs_import.hh restrictions.cc restrictions.hh revision.cc
        revision.hh roster.cc roster.hh roster_delta.cc
        roster_delta.hh roster_merge.hh sanity.hh
        schema_migration.cc schema_migration.hh selectors.cc
        selectors.hh simplestring_xform.cc simplestring_xform.hh
        ssh_agent.cc ssh_agent.hh std_hooks.lua tester.cc
        tests/automate_genkey/__driver__.lua
        tests/automate_get_current_revision_id/__driver__.lua
        tests/automate_get_revision/__driver__.lua
        tests/automate_inventory_options/__driver__.lua
        tests/automate_inventory_options/expected-no-ignored.stdout
        tests/automate_inventory_options/expected-no-unchanged.stdout
        tests/automate_inventory_options/expected-no-unknown.stdout
        tests/automate_inventory_options/expected-none.stdout
        tests/automate_inventory_options/expected-renames-both.stdout
        tests/automate_inventory_options/expected-renames-source.stdout
        
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
        
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
        tests/automate_inventory_options/expected-renames-target.stdout
        tests/automate_inventory_restricted/__driver__.lua
        tests/automate_keys/__driver__.lua
        tests/clone_-b_no_dir/__driver__.lua
        tests/clone_creates__MTN_log/__driver__.lua
        tests/clone_creates_right__MTN_options/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/disallowing_persistence_of_passphrase/__driver__.lua
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/log_quits_on_SIGPIPE/__driver__.lua
        tests/manifest_restrictions/__driver__.lua
        tests/merge_into_workspace_files_added/__driver__.lua
        tests/merge_update_part_of_file/after.diff
        tests/merge_update_part_of_file/before.diff
        tests/netsync_over_pipes/__driver__.lua
        tests/normalized_filenames/__driver__.lua
        tests/pluck_lifecycle/__driver__.lua
        tests/read_and_convert_old_privkey_packet/__driver__.lua
        tests/restricted_commands_are_consistent/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/stderr-ref
        tests/workspace_migration/__driver__.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua
        transforms.cc transforms.hh ui.cc ui.hh
        unix/ssh_agent_platform.cc unix/ssh_agent_platform.hh
        unix/terminal.cc update.cc update.hh vector.hh
        visualc/config.h vocab.cc vocab.hh vocab_terms.hh
        win32/monotone.iss win32/ssh_agent_platform.cc
        win32/ssh_agent_platform.hh win32/terminal.cc work.cc
        work.hh work_migration.cc
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' (head 
4ac045d2fb7b8c9dd2a4106ae38296d8b5d7cc3c)
            to branch 'net.venge.monotone.cvssync.refactor' (head 
b96a773248d501c63c03fd7b5210f4bf88b57ffa)


monotone --db={your.database} diff 
--revision=4ac045d2fb7b8c9dd2a4106ae38296d8b5d7cc3c 
--revision=140a485f45c88d605aff2fdb2d60ff402f676dbb
monotone --db={your.database} diff 
--revision=b96a773248d501c63c03fd7b5210f4bf88b57ffa 
--revision=140a485f45c88d605aff2fdb2d60ff402f676dbb
----------------------------------------------------------------------