[Monotone-commits-diffs] Revision 0772ad08e5a0c6593219fb22e077929e36afc044

[monotone]

-----------------------------------------------------------------
Revision: 0772ad08e5a0c6593219fb22e077929e36afc044
Ancestor: 364e7cc14b749dc383ebbfde490775d32e39a516
Ancestor: ee421239ec0badbf3221c899aa0e2bbc5d98df48
Author: address@hidden
Date: 2005-08-22T18:57:33
Branch: net.venge.monotone.cvssync.win32

Deleted files:
        ABOUT-NLS config.rpath cryptopp/algebra.cpp
        cryptopp/algebra.h cryptopp/algparam.cpp cryptopp/algparam.h
        cryptopp/arc4.cpp cryptopp/arc4.h cryptopp/argnames.h
        cryptopp/asn.cpp cryptopp/asn.h cryptopp/base64.cpp
        cryptopp/base64.h cryptopp/basecode.cpp cryptopp/basecode.h
        cryptopp/config.h cryptopp/crc.cpp cryptopp/crc.h
        cryptopp/cryptlib.cpp cryptopp/cryptlib.h cryptopp/des.cpp
        cryptopp/des.h cryptopp/dessp.cpp cryptopp/dll.cpp
        cryptopp/dll.h cryptopp/eprecomp.cpp cryptopp/eprecomp.h
        cryptopp/files.cpp cryptopp/files.h cryptopp/filters.cpp
        cryptopp/filters.h cryptopp/fips140.cpp cryptopp/fips140.h
        cryptopp/fltrimpl.h cryptopp/gzip.cpp cryptopp/gzip.h
        cryptopp/hex.cpp cryptopp/hex.h cryptopp/hmac.cpp
        cryptopp/hmac.h cryptopp/integer.cpp cryptopp/integer.h
        cryptopp/iterhash.cpp cryptopp/iterhash.h cryptopp/mdc.h
        cryptopp/misc.cpp cryptopp/misc.h cryptopp/modarith.h
        cryptopp/modes.cpp cryptopp/modes.h cryptopp/mqueue.cpp
        cryptopp/mqueue.h cryptopp/nbtheory.cpp cryptopp/nbtheory.h
        cryptopp/oaep.cpp cryptopp/oaep.h cryptopp/oids.h
        cryptopp/osrng.cpp cryptopp/osrng.h cryptopp/pch.cpp
        cryptopp/pch.h cryptopp/pkcspad.cpp cryptopp/pkcspad.h
        cryptopp/pssr.cpp cryptopp/pssr.h cryptopp/pubkey.cpp
        cryptopp/pubkey.h cryptopp/queue.cpp cryptopp/queue.h
        cryptopp/randpool.cpp cryptopp/randpool.h cryptopp/rng.cpp
        cryptopp/rng.h cryptopp/rsa.cpp cryptopp/rsa.h
        cryptopp/secblock.h cryptopp/seckey.h cryptopp/sha.cpp
        cryptopp/sha.h cryptopp/simple.h cryptopp/smartptr.h
        cryptopp/stdcpp.h cryptopp/strciphr.cpp cryptopp/strciphr.h
        cryptopp/trdlocal.cpp cryptopp/trdlocal.h cryptopp/words.h
        cryptopp/zdeflate.cpp cryptopp/zdeflate.h
        cryptopp/zinflate.cpp cryptopp/zinflate.h m4/codeset.m4
        m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4
        m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4
        m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4
        m4/lib-prefix.m4 m4/nls.m4 m4/po.m4 m4/progtest.m4
        m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 mkinstalldirs
        po/Makefile.in.in po/monotone.pot
Added files:
        WhyThisWay 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/authors.txt
        botan/barrett.cpp botan/barrett.h botan/base.cpp
        botan/base.h botan/base64.cpp botan/base64.h
        botan/base_eng.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/config.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.cpp
        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_get.cpp
        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_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/fips_rng.cpp botan/fips_rng.h botan/fused.cpp
        botan/get_algo.cpp botan/get_enc.cpp botan/get_pbe.cpp
        botan/gzip.cpp botan/gzip.h 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/license.txt 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_ssl3.cpp
        botan/prf_tls.cpp botan/prf_x942.cpp botan/primes.cpp
        botan/pubkey.cpp botan/pubkey.h botan/randpool.cpp
        botan/randpool.h botan/readme.txt 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/secalloc.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/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/x917_rng.cpp botan/x917_rng.h
        botan/x919_mac.h hash_map.hh i18n.h m4/externtemplate.m4
        m4/fexception.m4 m4/gnucxxhashmap.m4 m4/prog_cxx_warnings.m4
        m4/stlporthashmap.m4 m4/typeof.m4 netxx_pipe.cc
        netxx_pipe.hh pipe_test_client.c po/POTFILES.skip po/fr.po
        string_queue.cc string_queue.hh tests/t_commit_cancelled.at
        tests/t_commit_log_writeback.at
        tests/t_explicit_merge_with_anc.at tests/t_log_brief.at
        tests/t_merge_add_rename_add.at tests/t_merge_lca.at
        tests/t_update_branch.at
Modified files:
        AUTHORS ChangeLog INSTALL Makefile.am NEWS UPGRADE
        app_state.cc app_state.hh cert.cc change_set.cc commands.cc
        configure.ac constants.cc constants.hh contrib/colorize
        contrib/monoprof.sh contrib/monotone-import.pl
        contrib/monotone.el database.cc database_check.cc
        debian/changelog debian/control debian/docs file_io.cc
        globish.cc hmac.cc hmac.hh interner.hh keys.cc keys.hh
        lua.cc lua.hh manifest.cc merkle_tree.cc mkstemp.cc
        monotone.1 monotone.cc monotone.spec monotone.texi
        mt_version.cc netcmd.cc netcmd.hh netio.hh netsync.cc
        options.hh po/LINGUAS po/Makevars revision.cc revision.hh
        sanity.cc sanity.hh schema_migration.cc std_hooks.lua
        tests/t_ambig_update.at tests/t_ambiguous_tags.at
        tests/t_annotate.at tests/t_annotate_add_collision.at
        tests/t_annotate_branch_collision.at
        tests/t_annotate_copy_all.at
        tests/t_annotate_lineage_dependent.at
        tests/t_annotate_split_line.at tests/t_attr.at
        tests/t_attr_drop.at tests/t_attr_init.at
        tests/t_automate_attributes.at tests/t_automate_version.at
        tests/t_checkout_id_sets_branch.at
        tests/t_checkout_options.at tests/t_commit_log_1.at
        tests/t_commit_log_2.at tests/t_commit_message_file.at
        tests/t_crlf.at tests/t_cvsimport2.at
        tests/t_database_check.at tests/t_database_check_minor.at
        tests/t_db_execute.at
        tests/t_db_kill_branch_certs_locally.at
        tests/t_diff_external.at tests/t_diff_first_rev.at
        tests/t_diff_restrict.at tests/t_drop_attr.at
        tests/t_dropkey_1.at tests/t_dropkey_2.at
        tests/t_existsonpath.at tests/t_heads.at
        tests/t_heads_discontinuous_branch.at tests/t_inodeprints.at
        tests/t_kill_tag_locally.at tests/t_lua_includedir.at
        tests/t_merge_add_del.at tests/t_migrate_schema.at
        tests/t_multiple_heads_msg.at
        tests/t_netsync_checks_server_key.at
        tests/t_netsync_exclude.at tests/t_netsync_permissions.at
        tests/t_netsync_pubkey.at
        tests/t_netsync_read_permissions.at
        tests/t_netsync_repeated.at tests/t_netsync_unrelated.at
        tests/t_no_change_deltas.at tests/t_normalized_filenames.at
        tests/t_override_author_date.at
        tests/t_persistent_server_keys.at
        tests/t_persistent_server_keys_2.at
        tests/t_propagate_desc.at tests/t_rcfile_dir.at
        tests/t_rcfile_stdin.at tests/t_rename_attr.at
        tests/t_sql_unpack.at tests/t_sticky_branch.at
        tests/t_trusted.at testsuite.at transforms.cc transforms.hh
        unit_tests.cc unit_tests.hh unix/inodeprint.cc
        unix/process.cc update.cc vocab.hh win32/inodeprint.cc
        win32/monotone.iss win32/process.cc work.cc xdelta.cc

ChangeLog: 

explicit_merge of 364e7cc14b749dc383ebbfde490775d32e39a516
              and ee421239ec0badbf3221c899aa0e2bbc5d98df48
   using ancestor c9643fa1d7765c67f5f1dac17c2eb4b21a31c3e7
        to branch 'net.venge.monotone.cvssync.win32'


monotone --db={your.database} diff 
--revision=364e7cc14b749dc383ebbfde490775d32e39a516 
--revision=0772ad08e5a0c6593219fb22e077929e36afc044
monotone --db={your.database} diff 
--revision=ee421239ec0badbf3221c899aa0e2bbc5d98df48 
--revision=0772ad08e5a0c6593219fb22e077929e36afc044
----------------------------------------------------------------------