[Monotone-commits-diffs] Revision 4fb0c7c181fdc063f546f7735f1db23e79c2555b

[monotone]

-----------------------------------------------------------------
Revision: 4fb0c7c181fdc063f546f7735f1db23e79c2555b
Ancestor: 25d76182286bccd52c355d6770414c62065c823b
Ancestor: 4ed353fd6e17980d7e579987f33594b85664c6c7
Author: address@hidden
Date: 2008-05-10T04:42:19
Branch: net.venge.monotone.mark-merge-existence

Deleted entries:
        botan/es_file.cpp botan/es_file.h botan/inifile.cpp
        botan/zlib.cpp botan/zlib.h database_check.hh test_hooks.lua
        tests/automate_get_revision/expected2
        tests/database_is_closed_on_signal_exit
        tests/database_is_closed_on_signal_exit/__driver__.lua
        tests/log_quits_on_SIGPIPE/hookfile tests/show_conflicts
        tests/show_conflicts/__driver__.lua
Renamed entries:
        tests/automate_db_set,get to tests/automate_db_variables
        tests/clone_-b_no_dir to tests/clone_branch_no_dir
        tests/restricted_revert_bug to tests/revert_contents_not_parent_rename
        visualc/unit_tests.vcproj to visualc/unit_tester.vcproj
Added files:
        botan/es_dev.cpp botan/es_dev.h botan_pipe_cache.hh
        char_classifiers.hh contrib/monotone-inotify.lua
        cygwin/monotone-0.40-1.cygport
        cygwin/monotone-0.40-1.cygwin.patch debian/shlibs.local
        rev_types.hh
        tests/automate_get_current_revision/__driver__.lua
        tests/automate_get_options/__driver__.lua
        tests/automate_inventory_ignore_dirs/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/expected.stdout
        tests/automate_inventory_ignore_dirs/local_hooks.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_options/test_hooks.lua
        tests/automate_show_conflicts/__driver__.lua
        tests/automate_show_conflicts/expected-attribute-attached.stdout
        tests/automate_show_conflicts/expected-attribute-detached.stdout
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/automate_show_conflicts/expected-content-detached.stdout
        tests/automate_show_conflicts/expected-directory-loop.stdout
        tests/automate_show_conflicts/expected-duplicate-add-rename.stdout
        tests/automate_show_conflicts/expected-duplicate-adds.stdout
        
tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout
        tests/automate_show_conflicts/expected-duplicate-renames.stdout
        tests/automate_show_conflicts/expected-invalid-add.stdout
        tests/automate_show_conflicts/expected-invalid-rename.stdout
        tests/automate_show_conflicts/expected-missing-root.stdout
        
tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout
        
tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout
        tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout
        tests/automate_show_conflicts/expected-multiple-names.stdout
        tests/automate_show_conflicts/expected-orphaned-add.stdout
        tests/automate_show_conflicts/expected-orphaned-rename.stdout
        tests/automate_show_conflicts/expected-unrelated-projects.stdout
        tests/automate_show_conflicts_defaults/__driver__.lua
        tests/calculation_of_unidiffs_start_of_file/__driver__.lua
        tests/calculation_of_unidiffs_start_of_file/firstfile
        tests/calculation_of_unidiffs_start_of_file/secondfile
        tests/commit_use_workspace_keydir/__driver__.lua
        tests/conflict_messages/__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/i_selector/__driver__.lua
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/merge_update_part_of_file/__driver__.lua
        tests/merge_update_part_of_file/after.diff
        tests/merge_update_part_of_file/before.diff
        tests/merge_update_part_of_file/onechange
        tests/merge_update_part_of_file/original
        tests/merge_update_part_of_file/twochanges
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
        tests/netsync_mtn_uri_scheme/__driver__.lua
        tests/netsync_stops_on_key_id_clash/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/p_selector/__driver__.lua
        tests/resolve_duplicate_name_conflict/__driver__.lua
        tests/revert_drop_not_rename/__driver__.lua
        
tests/schema_migration/212dd25a23bfd7bfe030ab910e9d62aa66aa2955.mtn.dumped
        tests/schema_migration_error_recovery/bad_hexenc.dump
        tests/schema_migration_error_recovery/short_hexenc.dump
        tests/select_partial_id/__driver__.lua
        tests/signature_round_trip/__driver__.lua
        tests/sync_use_ws_opts/__driver__.lua
        tests/update_with_pending_modification/__driver__.lua
        tests/util_mtnopt/__driver__.lua
        tests/wrong_options_override_workspace_options/__driver__.lua
        util/mtnopt
Added directories:
        cygwin tests/automate_get_current_revision
        tests/automate_get_options
        tests/automate_inventory_ignore_dirs
        tests/automate_inventory_options
        tests/automate_show_conflicts
        tests/automate_show_conflicts_defaults
        tests/calculation_of_unidiffs_start_of_file
        tests/commit_use_workspace_keydir tests/conflict_messages
        tests/diff_on_missing_trailing_newline_at_end_of_file
        tests/i_selector tests/imp_test_filesync_confdir
        tests/merge_update_part_of_file
        tests/merge_with_conflicting_name_and_renamed_dir
        tests/netsync_mtn_uri_scheme
        tests/netsync_stops_on_key_id_clash
        tests/non_workspace_keydir tests/p_selector
        tests/resolve_duplicate_name_conflict
        tests/revert_drop_not_rename tests/select_partial_id
        tests/signature_round_trip tests/sync_use_ws_opts
        tests/update_with_pending_modification tests/util_mtnopt
        tests/wrong_options_override_workspace_options util
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/arc4.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/license.txt botan/loadstor.h botan/mdx_hash.cpp
        botan/mem_pool.cpp botan/mgf1.cpp botan/modules.cpp
        botan/mp_asm.cpp botan/mp_asm.h botan/mp_asmi.h
        botan/mp_misc.cpp botan/mp_mul.cpp botan/mp_mulop.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
        constants.hh contrib/monotone.bash_completion
        crypto_tests.cc cset.cc cset.hh database.cc database.hh
        database_check.cc debian/NEWS debian/changelog
        debian/control debian/monotone-server.postinst
        debian/monotone-server.postrm debian/rules diff_patch.cc
        diff_patch.hh enumerator.cc enumerator.hh epoch.cc
        examples/display_branches.lua figures/monotone-logo.svg
        file_io.cc file_io.hh globish.cc graph.cc graph.hh gzip.cc
        hmac.cc hmac.hh hybrid_map.hh inodeprint.cc inodeprint.hh
        key_store.cc key_store.hh keys.cc keys.hh lcs.cc legacy.cc
        legacy.hh lru_writeback_cache.hh lua-testsuite.lua lua.cc
        lua_hooks.cc lua_hooks.hh m4/pcre.m4 merge.cc merge.hh
        merkle_tree.cc merkle_tree.hh monotone.cc monotone.spec
        monotone.texi mtn-sanity.cc mtn-sanity.hh netcmd.cc
        netcmd.hh netsync.cc netxx/address.cxx netxx/peer.cxx
        netxx_pipe.cc notes/release-checklist.txt option.cc
        option.hh options.cc options.hh options_list.hh packet.cc
        packet.hh paths.cc paths.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/POTFILES.in 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 refiner.cc restrictions.cc restrictions.hh
        revision.cc revision.hh roster.cc roster.hh roster_delta.cc
        roster_delta.hh roster_merge.cc roster_merge.hh sanity.cc
        sanity.hh schema.sql schema_migration.cc schema_migration.hh
        selectors.cc selectors.hh sha1.cc simplestring_xform.cc
        simplestring_xform.hh ssh_agent.cc ssh_agent.hh
        std_hooks.lua tester.cc tests/automate_cert/__driver__.lua
        tests/automate_db_variables/__driver__.lua
        tests/automate_genkey/__driver__.lua
        tests/automate_get_current_revision_id/__driver__.lua
        tests/automate_get_revision/__driver__.lua
        tests/automate_heads/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/automate_inventory_restricted/__driver__.lua
        tests/automate_keys/__driver__.lua
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_branch_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/command_completion/__driver__.lua
        tests/common/netsync.lua tests/common/selectors.lua
        tests/common/test_utils_inventory.lua
        tests/database_check/__driver__.lua
        tests/db_check_(heights)/__driver__.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/disallowing_persistence_of_passphrase/__driver__.lua
        tests/log_quits_on_SIGPIPE/__driver__.lua
        tests/manifest_restrictions/__driver__.lua
        tests/merge_into_workspace_files_added/__driver__.lua
        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/restricted_diff_bug/__driver__.lua
        tests/revert_contents_not_parent_rename/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_error_recovery/__driver__.lua
        tests/server_initiated_sync/__driver__.lua
        tests/ssh_agent/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/stderr-ref
        tests/test_hooks.lua
        tests/workspace_migration/__driver__.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua texinfo.css
        transforms.cc transforms.hh unit_tests.cc unix/fs.cc
        unix/ssh_agent_platform.cc unix/ssh_agent_platform.hh
        unix/terminal.cc unix/tester-plaf.cc update.cc update.hh
        uri.cc uri.hh vector.hh visualc/config.h
        visualc/monotone.sln visualc/runtests.bat
        visualc/unit_tester.vcproj vocab.cc vocab.hh vocab_hash.hh
        vocab_macros.hh vocab_terms.hh win32/main.cc
        win32/monotone.bmp win32/monotone.iss
        win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
        win32/terminal.cc work.cc work.hh work_migration.cc
        xdelta.cc xdelta.hh
Modified attrs:
        util/mtnopt

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
25d76182286bccd52c355d6770414c62065c823b)
            to branch 'net.venge.monotone.mark-merge-existence' (head 
4ed353fd6e17980d7e579987f33594b85664c6c7)


monotone --db={your.database} diff 
--revision=25d76182286bccd52c355d6770414c62065c823b 
--revision=4fb0c7c181fdc063f546f7735f1db23e79c2555b
monotone --db={your.database} diff 
--revision=4ed353fd6e17980d7e579987f33594b85664c6c7 
--revision=4fb0c7c181fdc063f546f7735f1db23e79c2555b
----------------------------------------------------------------------