[Monotone-commits-diffs] Revision acfc0ecc770a3afee1e0dcda009a2131e0040d61

[monotone]

-----------------------------------------------------------------
Revision: acfc0ecc770a3afee1e0dcda009a2131e0040d61
Ancestor: 3ce1644edc27061a8d82bd90ecc5490e0b918bcc
Ancestor: 9c99bfb262dfae53eada8c2c9e8c7134bd759a17
Author: Timothy Brownawell  <address@hidden>
Date: 2005-10-13T21:21:29
Branch: net.venge.monotone.experiment.rosters

Deleted files:
        botan/base_eng.h botan/def_eng.cpp botan/dl_get.cpp
        botan/fips_rng.cpp botan/fips_rng.h botan/prf_ssl3.cpp
        botan/prf_tls.cpp botan/secalloc.h botan/x917_rng.cpp
        botan/x917_rng.h unix/platform_netsync.cc
        win32/platform_netsync.cc
Added files:
        botan/charset.h botan/def_alg.cpp botan/def_mode.cpp
        botan/des.cpp botan/des.h botan/des_tab.cpp
        botan/dl_cache.cpp botan/hash_id.h botan/pkcs5.cpp
        botan/pkcs5.h botan/sha256.cpp botan/sha256.h
        botan/x931_rng.cpp botan/x931_rng.h
        contrib/ciabot_monotone_hookversion.py
        contrib/monotone-cvs-ignore.lua contrib/usher.cc cset.cc
        cset.hh debian/README.Debian debian/TODO.Debian key_store.cc
        key_store.hh po/ja.po roster.cc roster.hh sqlite/analyze.c
        sqlite/complete.c sqlite/vdbefifo.c tests/t_add_inside_MT.at
        tests/t_annotate_renames.at tests/t_automate_get_file.at
        tests/t_automate_get_manifest.at
        tests/t_automate_get_revision.at tests/t_automate_keys.at
        tests/t_diff_outside_working_dir.at
        tests/t_key_management_without_db.at
        tests/t_log_outside_working_dir.at tests/t_mt_ignore.at
        tests/t_rename_diff_names.at
        tests/t_restriction_with_exclude.at
        tests/t_restriction_with_exclude_iprint.at
        tests/t_unreadable_db.at win32/wcwidth.c
Modified files:
        .mt-attrs AUTHORS ChangeLog Makefile.am NEWS 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/algolist.cpp botan/algolist.h
        botan/allocate.cpp botan/allocate.h botan/arc4.cpp
        botan/arc4.h botan/asn1.h botan/asn1_alg.cpp
        botan/asn1_alt.cpp botan/asn1_att.cpp botan/asn1_dn.cpp
        botan/asn1_ext.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/barrett.cpp botan/barrett.h
        botan/base.cpp botan/base.h botan/base64.cpp botan/base64.h
        botan/basefilt.cpp botan/basefilt.h botan/ber_code.cpp
        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/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/cbc.cpp botan/cbc.h botan/certstor.h
        botan/certstore.cpp botan/cfb.cpp botan/cfb.h
        botan/charset.cpp botan/conf.cpp botan/conf.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_eng.h
        botan/def_ops.cpp botan/defalloc.cpp botan/defalloc.h
        botan/der_code.cpp botan/der_enc.cpp botan/der_enc.h
        botan/dh.cpp botan/dh.h botan/divide.cpp botan/dl_algo.cpp
        botan/dl_algo.h botan/dl_group.cpp botan/dl_param.cpp
        botan/dl_param.h 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_file.cpp botan/es_file.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/fused.cpp botan/get_algo.cpp
        botan/get_enc.cpp botan/get_pbe.cpp botan/hash_id.cpp
        botan/hex.cpp botan/hex.h botan/hmac.cpp botan/hmac.h
        botan/if_algo.cpp botan/if_algo.h botan/inifile.cpp
        botan/init.cpp botan/init.h botan/kdf.cpp botan/kdf.h
        botan/keypair.cpp botan/keypair.h botan/look_add.h
        botan/look_pk.cpp botan/look_pk.h botan/lookup.cpp
        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/mod_exp.cpp botan/mod_exp.h botan/mode_pad.cpp
        botan/mode_pad.h botan/modebase.cpp botan/modebase.h
        botan/mp_comba.cpp botan/mp_core.cpp botan/mp_core.h
        botan/mp_fkmul.cpp botan/mp_madd.h botan/mp_misc.cpp
        botan/mp_mul.cpp botan/mp_shift.cpp botan/mp_smul.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/omac.h botan/par_hash.h
        botan/parse.cpp 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/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/socket.h botan/symkey.cpp
        botan/symkey.h 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/x919_mac.h cert.cc
        cert.hh change_set.hh commands.cc configure.ac
        contrib/ciabot_monotone.py contrib/get_stdio.pl
        contrib/perf-test.sh database.cc database.hh
        database_check.cc debian/changelog file_io.cc file_io.hh
        hash_map.hh keys.cc keys.hh lua.cc lua.hh main.cc
        merkle_tree.cc merkle_tree.hh monotone.cc monotone.spec
        monotone.texi netcmd.cc netcmd.hh netsync.cc
        netxx/address.cxx options.hh packet.cc packet.hh paths.cc
        paths.hh platform.hh po/LINGUAS po/Makevars po/POTFILES.in
        po/POTFILES.skip po/fr.po rcs_import.cc restrictions.cc
        restrictions.hh revision.cc revision.hh sanity.cc sanity.hh
        schema.sql schema_migration.cc schema_migration.hh
        sqlite/alter.c sqlite/attach.c sqlite/auth.c sqlite/btree.c
        sqlite/btree.h sqlite/build.c sqlite/callback.c
        sqlite/date.c sqlite/delete.c sqlite/expr.c sqlite/func.c
        sqlite/insert.c sqlite/keywordhash.h sqlite/main.c
        sqlite/opcodes.c sqlite/opcodes.h sqlite/os.h
        sqlite/os_common.h sqlite/os_unix.c sqlite/os_unix.h
        sqlite/os_win.c sqlite/pager.c sqlite/pager.h sqlite/parse.c
        sqlite/parse.h sqlite/pragma.c sqlite/prepare.c
        sqlite/printf.c sqlite/select.c sqlite/sqlite3.h
        sqlite/sqliteInt.h sqlite/tokenize.c sqlite/update.c
        sqlite/util.c sqlite/vdbe.c sqlite/vdbe.h sqlite/vdbeInt.h
        sqlite/vdbeapi.c sqlite/vdbeaux.c sqlite/vdbemem.c
        sqlite/where.c std_hooks.lua tests/t_add_dot.at
        tests/t_add_edge.at tests/t_add_stomp_file.at
        tests/t_add_vs_commit.at
        tests/t_annotate_branch_collision.at tests/t_at_sign.at
        tests/t_automate_stdio.at tests/t_cat_file_by_name.at
        tests/t_change_empty_file.at tests/t_cmdline_options.at
        tests/t_commit_message_file.at tests/t_cross.at
        tests/t_cvsimport.at tests/t_cvsimport_deleted_invar.at
        tests/t_cvsimport_drepper.at tests/t_cvsimport_drepper2.at
        tests/t_cvsimport_manifest_cycle.at
        tests/t_cvsimport_samelog.at tests/t_database_check.at
        tests/t_database_check_normalized.at
        tests/t_db_kill_rev_locally.at tests/t_db_with_dots.at
        tests/t_empty_env.at tests/t_empty_id_completion.at
        tests/t_empty_path.at tests/t_epoch.at
        tests/t_epoch_server.at tests/t_epoch_unidirectional.at
        tests/t_erename.at tests/t_existsonpath.at
        tests/t_i18n_file.at tests/t_import.at
        tests/t_inodeprints_hook.at tests/t_log_brief.at
        tests/t_lua_includedir.at tests/t_lua_privkey.at
        tests/t_merge2_add.at tests/t_merge2_data.at
        tests/t_merge_add_del.at tests/t_migrate_schema.at
        tests/t_movedel.at tests/t_movepatch.at tests/t_netsync.at
        tests/t_netsync_absorbs.at
        tests/t_netsync_checks_server_key.at
        tests/t_netsync_exclude.at
        tests/t_netsync_exclude_default.at tests/t_netsync_globs.at
        tests/t_netsync_largish_file.at tests/t_netsync_nocerts.at
        tests/t_netsync_permissions.at tests/t_netsync_pubkey.at
        tests/t_netsync_read_permissions.at
        tests/t_netsync_single.at tests/t_netsync_unrelated.at
        tests/t_normalized_filenames.at tests/t_null.at
        tests/t_persistent_server_keys_2.at
        tests/t_persistent_server_revision.at tests/t_rcfile_dir.at
        tests/t_remerge.at tests/t_rename.at
        tests/t_rename_dir_cross_level.at tests/t_renamed.at
        tests/t_scan.at tests/t_set_default.at
        tests/t_setup_existing_path.at tests/t_short_opts.at
        tests/t_singlecvs.at tests/t_sticky_branch.at
        tests/t_subdirs.at tests/t_unreadable_MT.at
        tests/t_update_with_pending_add.at
        tests/t_update_with_pending_drop.at
        tests/t_update_with_pending_rename.at tests/t_versions.at
        testsuite.at transforms.cc transforms.hh ui.cc ui.hh
        unit_tests.cc unit_tests.hh unix/fs.cc vocab.cc vocab.hh
        vocab_terms.hh win32/fs.cc win32/monotone.iss
        win32/process.cc win32/terminal.cc work.cc work.hh

ChangeLog: 

explicit_merge of '9c99bfb262dfae53eada8c2c9e8c7134bd759a17'
              and '3ce1644edc27061a8d82bd90ecc5490e0b918bcc'
   using ancestor 'e48d90968ce2381546ead091949564eaa08ba087'
        to branch 'net.venge.monotone.experiment.rosters'


monotone --db={your.database} diff 
--revision=3ce1644edc27061a8d82bd90ecc5490e0b918bcc 
--revision=acfc0ecc770a3afee1e0dcda009a2131e0040d61
monotone --db={your.database} diff 
--revision=9c99bfb262dfae53eada8c2c9e8c7134bd759a17 
--revision=acfc0ecc770a3afee1e0dcda009a2131e0040d61
----------------------------------------------------------------------