[Monotone-commits-diffs] Revision 1d723065f414aaae1471912ee077d0e75f646a5c

[monotone]

-----------------------------------------------------------------
Revision: 1d723065f414aaae1471912ee077d0e75f646a5c
Ancestor: 088b9661e8240bb20cb77d4d60c18cc8844f2aae
Ancestor: dbdbe17e4c91c50a2ab5bba83e5827d0b5541ce7
Author: address@hidden
Date: 2007-02-07T18:52:05
Branch: net.venge.monotone.workspace-merge.noconflict

Deleted entries:
        botan/algolist.cpp botan/algolist.h botan/allocate.cpp
        botan/asn1.h botan/asn1_ext.cpp botan/authors.txt
        botan/barrett.cpp botan/barrett.h botan/ber_code.cpp
        botan/conf.cpp botan/conf.h botan/def_eng.h
        botan/der_code.cpp botan/dl_cache.cpp botan/dl_param.cpp
        botan/dl_param.h botan/fused.cpp botan/lookup.cpp
        botan/mod_exp.cpp botan/mod_exp.h botan/mp_core.cpp
        botan/mp_fkmul.cpp botan/mp_madd.h botan/mp_smul.cpp
        botan/par_hash.h botan/x919_mac.h options.cc options.hh
        options_list.hh test_hooks.lua
Renamed entries:
        botan/asn1_alg.cpp to botan/alg_id.cpp
        botan/certstore.cpp to botan/certstor.cpp
        botan/config.h to botan/build.h
        botan/init.cpp to botan/init_def.cpp
        botan/readme.txt to botan/info.txt
        debian/README.Debian to debian/monotone.README.Debian
        debian/TODO.Debian to debian/monotone.TODO.Debian
        debian/docs to debian/monotone.docs
        debian/examples to debian/monotone-server.examples
        debian/info to debian/monotone.info
        tester.txt to notes/tester.txt
        tests/README to notes/README.testing
        tests/automate_automate_version to tests/automate_interface_version
        tests/automate_get_file to tests/automate_get_file,_automate_get_file_of
        tests/b_and_t_selector_globbing to tests/b_t_and_a_selector_globbing
        tests/check_automate_select to tests/automate_select
        tests/db_migrate_on_bad_schema to tests/schema_migration_bad_schema
        tests/include()_and_includedir()_lua_functions to 
tests/include()_includedir()_and_includedirpattern()_lua_functions
        tests/migrate_with_rosterify to tests/schema_migration_with_rosterify
        tests/workspace_inventory to tests/automate_inventory
        testsuite.txt to notes/testsuite.txt
Added files:
        botan/README.botan-monotone botan/alg_id.h
        botan/asn1_int.cpp botan/asn1_int.h botan/big_rand.cpp
        botan/config.cpp botan/config.h botan/credits.txt
        botan/datastor.cpp botan/datastor.h botan/def_char.cpp
        botan/def_char.h botan/def_powm.cpp botan/def_powm.h
        botan/dl_group.h botan/eng_def.h botan/init_opt.cpp
        botan/jacobi.cpp botan/libstate.cpp botan/libstate.h
        botan/modules.cpp botan/modules.h botan/mp_asm.cpp
        botan/mp_asm.h botan/mp_asmi.h botan/mp_mulop.cpp
        botan/mp_numth.cpp botan/mp_sqr.cpp botan/pow_mod.h
        botan/powm_fw.cpp botan/powm_mnt.cpp botan/stl_util.h
        botan/x509_ext.cpp botan/x509_ext.h botan/x509find.h
        botan/x509stat.cpp botan/x509stat.h contrib/ext_hooks.lua.in
        contrib/ext_hooks_expand.pl contrib/mashschema.cc
        contrib/monotone-mirror-postaction-update.sh
        contrib/monotone-mirror.sh
        contrib/monotone-run-script-post-netsync.lua debian/NEWS
        debian/monotone-doc.docs
        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.dirs
        debian/monotone.examples debian/monotone.install
        debian/po/POTFILES.in debian/po/fr.po
        debian/po/templates.pot do-editor-vars.sh examples/mirror.rc
        examples/read-permissions examples/write-permissions
        notes/release-checklist.txt option.cc option.hh options.cc
        options.hh options_list.hh outdated_indicator.cc
        outdated_indicator.hh po/es.po project.cc project.hh
        rev_height.cc rev_height.hh test_hooks.lua
        tests/add_ignored/__driver__.lua
        tests/add_ignores__MTN/__driver__.lua
        tests/automate_content_diff/__driver__.lua
        tests/automate_stdio_options/__driver__.lua
        tests/checkout_clobbers_workspace/__driver__.lua
        tests/commit_using__MTN_log/commit_log_modified_return.lua
        tests/db_check_(heights)/__driver__.lua
        tests/disapproving_with_message/__driver__.lua
        tests/fail_cleanly_when__MTN_format_corrupt/__driver__.lua
        tests/import/__driver__.lua tests/log_--to/__driver__.lua
        tests/ls_unknown_in_subdir/__driver__.lua
        tests/merge_into_workspace/__driver__.lua
        tests/merge_into_workspace/dont_merge
        tests/merge_into_workspace/left
        tests/merge_into_workspace/merged
        tests/merge_into_workspace/otherfile
        tests/merge_into_workspace/otherfile_mod
        tests/merge_into_workspace/right
        tests/merge_into_workspace/testfile
        tests/merge_into_workspace_attr_corpse/__driver__.lua
        tests/merge_into_workspace_attr_corpse/expected-roster
        tests/merge_into_workspace_attr_corpse/testfile
        tests/merge_into_workspace_files_added/__driver__.lua
        tests/merge_into_workspace_files_added/expected-revision
        tests/merge_into_workspace_files_added/left
        tests/merge_into_workspace_files_added/right
        tests/merge_into_workspace_files_added/testfile
        tests/merge_into_workspace_no_changes/__driver__.lua
        tests/merge_into_workspace_no_changes/left
        tests/merge_into_workspace_no_changes/right
        tests/merge_into_workspace_no_changes/testfile
        tests/merge_into_workspace_no_changes/unrelated
        tests/missing_empty_dir/__driver__.lua
        tests/mkdir/__driver__.lua tests/mkdir/ignore_hook.lua
        tests/multiple_message_commit/__driver__.lua
        tests/netsync_epoch_refinement/__driver__.lua
        tests/netsync_hook_errcodes/__driver__.lua
        tests/netsync_permissions_wildcards/__driver__.lua
        tests/netsync_permissions_wildcards/read-permissions
        tests/netsync_permissions_wildcards/write-permissions
        tests/scanning_trees/manifest1
        
tests/schema_migration/2881277287f6ee9bfc5ee255a503a6dc20dd5994.mtn.dumped
        
tests/schema_migration/48fd5d84f1e5a949ca093e87e5ac558da6e5956d.mtn.dumped
        tests/schema_migration_bad_schema/bogus.dump
        tests/schema_migration_bad_schema/empty.dump
        tests/schema_migration_bad_schema/possible.dump
        tests/schema_migration_error_recovery/__driver__.lua
        tests/schema_migration_error_recovery/bad_base64.dump
        tests/schema_migration_error_recovery/column_missing.dump
        tests/schema_migration_error_recovery/heights_already.dump
        tests/schema_migration_error_recovery/no_revision_roster.dump
        tests/schema_migration_error_recovery/tmp_in_the_way.dump
        tests/serve_pull_with_--exclude/read-permissions
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/spawn_redirected_hook_helper/testhooks
        tests/test_a_merge_8/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
        tests/update_clobbers_workspace/__driver__.lua
Added directories:
        debian/po notes tests/add_ignored tests/add_ignores__MTN
        tests/automate_content_diff tests/automate_stdio_options
        tests/checkout_clobbers_workspace tests/db_check_(heights)
        tests/disapproving_with_message
        tests/fail_cleanly_when__MTN_format_corrupt tests/import
        tests/log_--to tests/ls_unknown_in_subdir
        tests/merge_into_workspace
        tests/merge_into_workspace_attr_corpse
        tests/merge_into_workspace_files_added
        tests/merge_into_workspace_no_changes
        tests/missing_empty_dir tests/mkdir
        tests/multiple_message_commit tests/netsync_epoch_refinement
        tests/netsync_hook_errcodes
        tests/netsync_permissions_wildcards
        tests/schema_migration_error_recovery
        tests/spawn_redirected_hook_helper tests/test_a_merge_8
        tests/update_clobbers_workspace
Modified files:
        .mtn-ignore ChangeLog HACKING INSTALL Makefile.am NEWS
        README.changesets UPGRADE annotate.cc app_state.cc
        app_state.hh automate.cc basic_io.cc basic_io.hh
        botan/aes.cpp botan/aes.h botan/aes_tab.cpp botan/alg_id.cpp
        botan/allocate.h botan/arc4.cpp botan/arc4.h
        botan/asn1_alt.cpp botan/asn1_att.cpp botan/asn1_dn.cpp
        botan/asn1_ku.cpp botan/asn1_obj.h botan/asn1_oid.cpp
        botan/asn1_oid.h botan/asn1_str.cpp botan/asn1_tm.cpp
        botan/base.cpp botan/base.h botan/base64.cpp botan/base64.h
        botan/basefilt.cpp botan/basefilt.h botan/ber_dec.cpp
        botan/ber_dec.h botan/big_base.cpp botan/big_code.cpp
        botan/big_io.cpp botan/big_ops2.cpp botan/big_ops3.cpp
        botan/bigint.h botan/bit_ops.cpp botan/bit_ops.h
        botan/blinding.cpp botan/blinding.h botan/botan.h
        botan/buf_es.cpp botan/buf_es.h botan/buf_filt.cpp
        botan/buf_filt.h botan/build.h botan/cbc.cpp botan/cbc.h
        botan/certstor.cpp botan/certstor.h botan/cfb.cpp
        botan/cfb.h botan/charset.cpp botan/charset.h
        botan/crc32.cpp botan/crc32.h botan/crl_ent.cpp
        botan/crl_ent.h botan/ctr.cpp botan/ctr.h botan/cts.cpp
        botan/cts.h botan/data_snk.cpp botan/data_snk.h
        botan/data_src.cpp botan/data_src.h botan/def_alg.cpp
        botan/def_mode.cpp botan/def_ops.cpp botan/defalloc.cpp
        botan/defalloc.h botan/der_enc.cpp botan/der_enc.h
        botan/des.cpp botan/des.h botan/des_tab.cpp botan/dh.cpp
        botan/dh.h botan/divide.cpp botan/dl_algo.cpp
        botan/dl_algo.h botan/dl_group.cpp botan/dlies.cpp
        botan/dlies.h botan/eax.cpp botan/eax.h botan/ecb.cpp
        botan/ecb.h botan/eme.h botan/eme1.cpp botan/eme_pkcs.cpp
        botan/emsa.h botan/emsa1.cpp botan/emsa2.cpp botan/emsa3.cpp
        botan/emsa4.cpp botan/emsa_raw.cpp botan/eng_base.cpp
        botan/engine.cpp botan/engine.h botan/enums.h
        botan/es_capi.cpp botan/es_capi.h botan/es_egd.cpp
        botan/es_egd.h botan/es_file.cpp botan/es_file.h
        botan/es_win32.cpp botan/es_win32.h botan/exceptn.cpp
        botan/exceptn.h botan/filter.cpp botan/filter.h
        botan/filters.cpp botan/filters.h botan/fips140.cpp
        botan/fips140.h botan/get_algo.cpp botan/get_enc.cpp
        botan/get_pbe.cpp botan/gzip.cpp botan/hash_id.cpp
        botan/hash_id.h botan/hex.cpp botan/hex.h botan/hmac.cpp
        botan/hmac.h botan/if_algo.cpp botan/if_algo.h
        botan/info.txt botan/inifile.cpp botan/init.h
        botan/init_def.cpp botan/kdf.cpp botan/kdf.h
        botan/keypair.cpp botan/keypair.h botan/license.txt
        botan/look_add.h botan/look_pk.cpp botan/look_pk.h
        botan/lookup.h botan/make_prm.cpp botan/mdx_hash.cpp
        botan/mdx_hash.h botan/mem_ops.h botan/mem_pool.cpp
        botan/mem_pool.h botan/mgf1.cpp botan/mgf1.h botan/mlock.cpp
        botan/mode_pad.cpp botan/mode_pad.h botan/modebase.cpp
        botan/modebase.h botan/mp_comba.cpp botan/mp_core.h
        botan/mp_misc.cpp botan/mp_mul.cpp botan/mp_shift.cpp
        botan/mp_types.h botan/mutex.cpp botan/mutex.h
        botan/numthry.cpp botan/numthry.h botan/ofb.cpp botan/ofb.h
        botan/oids.cpp botan/oids.h botan/out_buf.cpp
        botan/out_buf.h botan/parsing.cpp botan/parsing.h
        botan/pbe.h botan/pbe_pkcs.h botan/pbes1.cpp botan/pbes2.cpp
        botan/pem.cpp botan/pem.h botan/pipe.cpp botan/pipe.h
        botan/pipe_io.cpp botan/pipe_rw.cpp botan/pk_algs.cpp
        botan/pk_algs.h botan/pk_core.cpp botan/pk_core.h
        botan/pk_filts.cpp botan/pk_filts.h botan/pk_keys.cpp
        botan/pk_keys.h botan/pk_ops.h botan/pk_util.cpp
        botan/pk_util.h botan/pkcs10.cpp botan/pkcs10.h
        botan/pkcs5.cpp botan/pkcs5.h botan/pkcs8.cpp botan/pkcs8.h
        botan/policy.cpp botan/pow_mod.cpp botan/prf_x942.cpp
        botan/primes.cpp botan/pubkey.cpp botan/pubkey.h
        botan/randpool.cpp botan/randpool.h botan/reducer.cpp
        botan/reducer.h botan/rng.cpp botan/rng.h botan/rsa.cpp
        botan/rsa.h botan/s2k.cpp botan/s2k.h botan/secmem.h
        botan/secqueue.cpp botan/secqueue.h botan/sha160.cpp
        botan/sha160.h botan/sha256.cpp botan/sha256.h
        botan/symkey.cpp botan/symkey.h botan/thanks.txt
        botan/timers.cpp botan/timers.h botan/types.h botan/ui.cpp
        botan/ui.h botan/util.cpp botan/util.h botan/version.h
        botan/x509_ca.cpp botan/x509_ca.h botan/x509_crl.cpp
        botan/x509_crl.h botan/x509_key.cpp botan/x509_key.h
        botan/x509_obj.cpp botan/x509_obj.h botan/x509cert.cpp
        botan/x509cert.h botan/x509find.cpp botan/x509opt.cpp
        botan/x509self.cpp botan/x509self.h botan/x509stor.cpp
        botan/x509stor.h botan/x931_rng.cpp botan/x931_rng.h cert.cc
        cert.hh charset.cc 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.cc constants.hh contrib/README
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        contrib/monotone.el contrib/monotone.zsh_completion cset.cc
        database.cc database.hh database_check.cc debian/changelog
        debian/control debian/monotone.docs debian/rules
        diff_patch.cc enumerator.cc examples/000README.txt
        file_io.cc file_io.hh graph.cc graph.hh inodeprint.cc
        keys.cc localized_file_io.cc lru_writeback_cache.hh
        lua/lstrlib.cc 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
        merge.cc merkle_tree.cc mkstemp.cc monotone.cc monotone.spec
        monotone.texi mtn-sanity.cc mtn-sanity.hh mtn.1 netcmd.cc
        netsync.cc notes/README.testing notes/tester.txt
        notes/testsuite.txt numeric_vocab.cc packet.cc paths.cc
        paths.hh platform-wrapped.hh po/LINGUAS po/POTFILES.in
        po/de.po po/fr.po po/it.po po/ja.po po/pt_BR.po po/sv.po
        randomfile.hh randomizer.cc randomizer.hh rcs_file.cc
        rcs_import.cc refiner.cc restrictions.cc restrictions.hh
        revision.cc revision.hh roster.cc roster.hh roster_delta.cc
        roster_delta.hh roster_merge.cc sanity.cc schema.sql
        schema_migration.cc schema_migration.hh sha1.cc sha1.hh
        sha1_engine.hh sqlite/alter.c sqlite/btree.c sqlite/btree.h
        sqlite/build.c sqlite/date.c sqlite/expr.c sqlite/func.c
        sqlite/insert.c sqlite/legacy.c sqlite/loadext.c
        sqlite/main.c sqlite/opcodes.c sqlite/opcodes.h sqlite/os.h
        sqlite/os_common.h sqlite/os_os2.c sqlite/os_unix.c
        sqlite/os_win.c sqlite/pager.c sqlite/pager.h sqlite/parse.c
        sqlite/pragma.c sqlite/prepare.c sqlite/printf.c
        sqlite/random.c sqlite/select.c sqlite/sqlite3.h
        sqlite/sqlite3ext.h sqlite/sqliteInt.h sqlite/table.c
        sqlite/tokenize.c sqlite/trigger.c sqlite/utf.c
        sqlite/util.c sqlite/vacuum.c sqlite/vdbe.c sqlite/vdbe.h
        sqlite/vdbeInt.h sqlite/vdbeapi.c sqlite/vdbeaux.c
        sqlite/vdbemem.c sqlite/vtab.c sqlite/where.c std_hooks.lua
        tester.cc tester.lua
        tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua
        tests/(minor)_drop_in_subdir/__driver__.lua
        tests/_--author,_--date/__driver__.lua
        tests/_MTN_case-folding_security_patch/__driver__.lua
        tests/add_in_subdir/__driver__.lua
        tests/add_inside__MTN_/__driver__.lua
        tests/addition_of_files_and_directories/__driver__.lua
        tests/attr_command_in_subdirs/__driver__.lua
        tests/automate_certs/expected
        tests/automate_genkey/__driver__.lua
        tests/automate_get_file,_automate_get_file_of/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/automate_stdio/__driver__.lua
        tests/b_t_and_a_selector_globbing/__driver__.lua
        
tests/checking_that_certain_commands_ignores_the_contents_of__MTN_options/__driver__.lua
        tests/checkout_creates__MTN_log/commit_log.lua
        tests/commit_using__MTN_log/__driver__.lua
        tests/commit_validation_lua_hook/commit_validate.lua
        tests/common/netsync-hooks.lua
        tests/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua
        tests/db_data_format_checking/__driver__.lua
        tests/dump_on_crash/__driver__.lua
        tests/exchanging_work_via_netsync,_with_notes/__driver__.lua
        tests/exchanging_work_via_netsync,_with_notes/testnotes.test
        tests/exchanging_work_via_netsync,_with_notes/testnotes2.test
        tests/fail_cleanly_on_unreadable_db/__driver__.lua
        tests/files_with_intermediate__MTN_path_elements/__driver__.lua
        tests/get_netsync_read_permitted/__driver__.lua
        tests/i18n_commit_messages/extra_hooks.lua
        
tests/include()_includedir()_and_includedirpattern()_lua_functions/__driver__.lua
        tests/log_and_selectors_returning_multiple_rids/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/ls_unknown_of_unknown_subdir/__driver__.lua
        tests/merge_rename_file_and_rename_dir/__driver__.lua
        tests/mtn_add_dot/__driver__.lua
        tests/mtn_execute_attr_respects_umask/__driver__.lua
        tests/netsync,--exclude,defaults/__driver__.lua
        tests/netsync,--set-default/__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_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_server_absorbs_and_checks_epochs/__driver__.lua
        tests/netsync_transfers_public_keys/__driver__.lua
        tests/netsync_verifies_server_keys/__driver__.lua
        tests/netsync_with_globs/__driver__.lua
        tests/one-way_netsync_where_the_sink_has_more_epochs/__driver__.lua
        tests/persistent_netsync_server_-_keys/__driver__.lua
        tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua
        tests/pid_file_and_log_handles_open_failures/__driver__.lua
        tests/pid_file_cleanup/__driver__.lua
        tests/pivot_root/__driver__.lua
        tests/quiet_turns_off_tickers_but_not_warnings/__driver__.lua
        tests/reallyquiet_turns_off_tickers_and_warnings/__driver__.lua
        tests/rename_in_subdir/__driver__.lua
        tests/renaming_a_directory/__driver__.lua
        tests/restricted_commands_are_consistent/__driver__.lua
        tests/restrictions_with_renames_and_adds/__driver__.lua
        tests/revert_in_subdirs/__driver__.lua
        tests/reverting_a_pivot_root/__driver__.lua
        tests/scanning_trees/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_bad_schema/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        tests/serve_pull_with_--exclude/__driver__.lua
        tests/subdirectory_restrictions/__driver__.lua
        tests/test_hooks.lua
        tests/things_in_.mtn-ignore_get_ignored/__driver__.lua
        tests/unnormalized_paths_in_database/__driver__.lua
        tests/updating_through_a_pivot_root/__driver__.lua
        testsuite.lua texinfo.css transforms.cc transforms.hh ui.cc
        unit_tests.cc unix/process.cc update.cc uri.cc
        visualc/config.h visualc/lua.vcproj visualc/monotone.vcproj
        vocab.cc vocab.hh vocab_macros.hh vocab_terms.hh
        win32/main.cc win32/monotone.iss win32/process.cc work.cc
        work.hh work_migration.cc
Modified attrs:
        contrib/monotone-mirror-postaction-update.sh
        contrib/monotone-mirror.sh do-editor-vars.sh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
dbdbe17e4c91c50a2ab5bba83e5827d0b5541ce7)
            to branch 'net.venge.monotone.workspace-merge.noconflict' (head 
088b9661e8240bb20cb77d4d60c18cc8844f2aae)


monotone --db={your.database} diff 
--revision=088b9661e8240bb20cb77d4d60c18cc8844f2aae 
--revision=1d723065f414aaae1471912ee077d0e75f646a5c
monotone --db={your.database} diff 
--revision=dbdbe17e4c91c50a2ab5bba83e5827d0b5541ce7 
--revision=1d723065f414aaae1471912ee077d0e75f646a5c
----------------------------------------------------------------------