[Monotone-commits-diffs] Revision 3f0d0166245bac5534f239ea33c1becf96b1784b

[monotone]

-----------------------------------------------------------------
Revision: 3f0d0166245bac5534f239ea33c1becf96b1784b
Ancestor: 9625c36d79b78e3b61ba371c0ab92e9bc772ba19
Ancestor: f9826205b07154f59bc1c9dabf980ed50da7b2bc
Author: Richard Levitte <address@hidden>
Date: 2008-03-25T23:40:48
Branch: net.venge.monotone.levitte.select-heads-of

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/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 debian/shlibs.local rev_types.hh
        tests/automate_get_current_revision/__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/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/duplicate_key_id/__driver__.lua
        tests/duplicate_key_id/bad_test_key
        tests/heads_of_certs/__driver__.lua
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/merge((patch_a),_(drop_a))/__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/netsync_mtn_uri_scheme/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/p_selector/__driver__.lua
        tests/revert_drop_not_rename/__driver__.lua
        tests/signature_round_trip/__driver__.lua
        tests/sync_use_ws_opts/__driver__.lua
        tests/update_with_pending_modification/__driver__.lua
        visualc/pcre.vcproj
Added directories:
        tests/automate_get_current_revision
        tests/automate_inventory_ignore_dirs
        tests/automate_inventory_options
        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/duplicate_key_id tests/heads_of_certs
        tests/imp_test_filesync_confdir
        tests/merge((patch_a),_(drop_a))
        tests/merge_update_part_of_file tests/netsync_mtn_uri_scheme
        tests/non_workspace_keydir tests/p_selector
        tests/revert_drop_not_rename tests/signature_round_trip
        tests/sync_use_ws_opts
        tests/update_with_pending_modification
Modified files:
        .mtn-ignore AUTHORS COPYING 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
        contrib/monotone.bash_completion cset.hh database.cc
        database.hh database_check.cc debian/changelog
        debian/control debian/copyright
        debian/monotone-server.postrm debian/mtn.1 debian/rules
        diff_patch.cc diff_patch.hh enumerator.cc enumerator.hh
        file_io.cc file_io.hh globish.cc globish.hh 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 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 numeric_vocab.cc
        option.cc option.hh options.cc options.hh options_list.hh
        packet.cc packet.hh 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
        pcrewrap.cc pcrewrap.hh 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 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_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_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_inventory/__driver__.lua
        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/command_completion/__driver__.lua
        tests/common/netsync.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/server_initiated_sync/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/__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
        vector.hh visualc/botan.vcproj visualc/config.h
        visualc/monotone.sln visualc/monotone.vcproj
        visualc/runtests.bat visualc/stringprep.vcproj
        visualc/tester.vcproj visualc/txt2c.vcproj
        visualc/unit_tester.vcproj vocab.cc vocab.hh vocab_hash.hh
        vocab_macros.hh vocab_terms.hh win32/main.cc
        win32/monotone.iss win32/ssh_agent_platform.cc
        win32/ssh_agent_platform.hh win32/terminal.cc
        win32/tester-plaf.cc work.cc work.hh work_migration.cc
        xdelta.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
9625c36d79b78e3b61ba371c0ab92e9bc772ba19)
            to branch 'net.venge.monotone.levitte.select-heads-of' (head 
f9826205b07154f59bc1c9dabf980ed50da7b2bc)


monotone --db={your.database} diff 
--revision=9625c36d79b78e3b61ba371c0ab92e9bc772ba19 
--revision=3f0d0166245bac5534f239ea33c1becf96b1784b
monotone --db={your.database} diff 
--revision=f9826205b07154f59bc1c9dabf980ed50da7b2bc 
--revision=3f0d0166245bac5534f239ea33c1becf96b1784b
----------------------------------------------------------------------