[Monotone-commits-diffs] Revision 9070c60fa2e8814aa1535ec2188aedf51d46c632

[monotone]

-----------------------------------------------------------------
Revision: 9070c60fa2e8814aa1535ec2188aedf51d46c632
Ancestor: d87105a07f0863264b4fcc82d4481f94e86748e8
Ancestor: e07b49a2f9e4b64abed0a859e58609c5e81e33e3
Author: address@hidden
Date: 2006-01-10T21:53:30
Branch: net.venge.monotone.cvssync

Deleted entries:
        botan/socket.h manifest.cc manifest.hh po/pt_BR.po
        tests/t_automate_get_manifest.at tests/t_rebuild.at
Renamed entries:
        botan/parse.cpp to botan/parsing.cpp
        tests/t_migrate_schema.at to tests/t_migrate_rosterify.at
Added files:
        CVS_prot botan/bit_ops.cpp botan/bit_ops.h botan/md5.cpp
        botan/md5.h botan/out_buf.cpp botan/out_buf.h
        botan/parsing.h cset.cc cset.hh cvs_client.cc cvs_client.hh
        cvs_sync.cc cvs_sync.hh enumerator.cc enumerator.hh
        legacy.cc legacy.hh merge.cc merge.hh parallel_iter.hh
        piece_table.cc piece_table.hh po/pt_BR.po refiner.cc
        refiner.hh roster.cc roster.hh roster_merge.cc
        roster_merge.hh safe_map.hh stringtok.hh
        tests/t_automate_get_manifest_of.at
        tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_cvsbranch.at tests/t_cvspull_md5fail.at
        tests/t_cvspull_rapid.at tests/t_cvspull_samedirname.at
        tests/t_cvspull_separate.at tests/t_cvspull_xmodule.at
        tests/t_cvspush_loop.at tests/t_cvstakeover_modified.at
        tests/t_migrate_schema.at
        tests/t_restricted_commands_consistent.at
        tests/t_rosterify_attrs.at tests/t_rosterify_drop_attrs.at
        tests/t_rosterify_one_rev.at tests/t_rosterify_rename.at
Modified files:
        AUTHORS ChangeLog Makefile.am NEWS UPGRADE annotate.cc
        annotate.hh app_state.cc app_state.hh automate.cc
        basic_io.cc basic_io.hh botan/aes.cpp botan/algolist.cpp
        botan/arc4.cpp botan/asn1.h botan/asn1_alt.cpp
        botan/asn1_dn.cpp botan/asn1_ku.cpp botan/asn1_oid.cpp
        botan/asn1_str.cpp botan/asn1_tm.cpp botan/barrett.cpp
        botan/base.cpp botan/base.h botan/base64.cpp
        botan/basefilt.cpp botan/basefilt.h botan/ber_code.cpp
        botan/ber_dec.cpp botan/big_base.cpp botan/big_code.cpp
        botan/big_ops2.cpp botan/big_ops3.cpp botan/botan.h
        botan/buf_es.cpp botan/cbc.cpp botan/cfb.cpp botan/conf.cpp
        botan/conf.h botan/crc32.cpp botan/crl_ent.cpp botan/ctr.cpp
        botan/cts.cpp 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/der_enc.cpp botan/des.cpp
        botan/dh.cpp botan/dl_param.cpp botan/dlies.cpp
        botan/eax.cpp botan/emsa4.cpp botan/enums.h
        botan/es_capi.cpp botan/es_capi.h botan/es_egd.cpp
        botan/es_file.cpp botan/exceptn.cpp botan/filter.cpp
        botan/filter.h botan/fips140.cpp botan/get_enc.cpp
        botan/get_pbe.cpp botan/gzip.cpp botan/hex.cpp
        botan/hmac.cpp botan/inifile.cpp botan/init.cpp botan/init.h
        botan/kdf.cpp botan/make_prm.cpp botan/mdx_hash.cpp
        botan/mem_pool.cpp botan/mgf1.cpp botan/mp_fkmul.cpp
        botan/mp_types.h botan/numthry.cpp botan/numthry.h
        botan/ofb.cpp botan/parsing.cpp botan/pbes1.cpp
        botan/pbes2.cpp botan/pem.cpp botan/pipe.cpp botan/pipe.h
        botan/pipe_rw.cpp botan/pkcs10.cpp botan/pkcs5.cpp
        botan/policy.cpp botan/prf_x942.cpp botan/pubkey.cpp
        botan/randpool.cpp botan/randpool.h botan/readme.txt
        botan/reducer.cpp botan/rng.cpp botan/rsa.cpp botan/secmem.h
        botan/secqueue.cpp botan/secqueue.h botan/sha160.cpp
        botan/sha256.cpp botan/symkey.cpp botan/symkey.h
        botan/timers.cpp botan/types.h botan/util.cpp botan/util.h
        botan/version.h botan/x509_ca.cpp botan/x509_crl.cpp
        botan/x509_key.cpp botan/x509_obj.cpp botan/x509cert.cpp
        botan/x509find.cpp botan/x509opt.cpp botan/x509stor.cpp
        botan/x931_rng.cpp commands.cc configure.ac constants.cc
        constants.hh contrib/ciabot_monotone.py contrib/usher.cc
        database.cc database.hh database_check.cc debian/changelog
        diff_patch.cc diff_patch.hh file_io.cc file_io.hh
        hash_map.hh inodeprint.cc inodeprint.hh lua/liolib.c lua.cc
        merkle_tree.cc merkle_tree.hh monotone.1 monotone.cc
        monotone.spec monotone.texi netcmd.cc netcmd.hh netsync.cc
        options.hh packet.cc packet.hh paths.cc paths.hh
        po/POTFILES.in po/fr.po po/ja.po rcs_import.cc
        restrictions.cc restrictions.hh revision.cc revision.hh
        sanity.cc sanity.hh schema.sql schema_migration.cc
        sqlite/pager.c sqlite/sqlite3.h std_hooks.lua
        tests/t_add_dot.at tests/t_add_edge.at
        tests/t_add_vs_commit.at tests/t_annotate.at
        tests/t_annotate_add_collision.at
        tests/t_annotate_branch_collision.at tests/t_attr.at
        tests/t_attr_drop.at tests/t_attr_init.at
        tests/t_attributes.at tests/t_automate_get_revision.at
        tests/t_automate_inventory.at tests/t_change_empty_file.at
        tests/t_cvsimport_drepper.at tests/t_cvsimport_drepper2.at
        tests/t_database_check.at tests/t_database_check_minor.at
        tests/t_database_check_normalized.at tests/t_drop_attr.at
        tests/t_epoch.at tests/t_epoch_server.at tests/t_erename.at
        tests/t_explicit_merge_with_anc.at tests/t_i18n_file.at
        tests/t_lf_crlf.at tests/t_log_nonexistent.at
        tests/t_ls_known.at tests/t_merge2_add.at
        tests/t_merge2_add_drop_add.at tests/t_merge2_data.at
        tests/t_merge_add_del.at tests/t_merge_lca.at
        tests/t_merge_manual.at tests/t_migrate_rosterify.at
        tests/t_movedel.at tests/t_movepatch.at
        tests/t_netsync_exclude.at tests/t_netsync_nocerts.at
        tests/t_netsync_permissions.at
        tests/t_netsync_read_permissions.at
        tests/t_netsync_unrelated.at tests/t_normalized_filenames.at
        tests/t_related_merge2_data.at tests/t_remerge.at
        tests/t_rename.at tests/t_rename_attr.at
        tests/t_rename_diff_names.at
        tests/t_rename_dir_add_dir_with_old_name.at
        tests/t_renamed.at tests/t_revert.at
        tests/t_revert_restrict.at tests/t_scan.at
        tests/t_select_cert.at tests/t_selector_later_earlier.at
        tests/t_status.at tests/t_sticky_branch.at
        tests/t_subdir_attr.at tests/t_subdirs.at
        tests/t_update_to_revision.at
        tests/t_update_with_pending_add.at
        tests/t_update_with_pending_drop.at
        tests/t_update_with_pending_rename.at testsuite.at
        transforms.cc transforms.hh ui.cc ui.hh unit_tests.cc
        unit_tests.hh unix/process.cc update.cc update.hh vocab.cc
        vocab.hh vocab_terms.hh win32/monotone.iss work.cc work.hh
        xdelta.cc xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.cvssync.win32' (head 
d87105a07f0863264b4fcc82d4481f94e86748e8)
            to branch 'net.venge.monotone.cvssync' (head 
e07b49a2f9e4b64abed0a859e58609c5e81e33e3)


monotone --db={your.database} diff 
--revision=d87105a07f0863264b4fcc82d4481f94e86748e8 
--revision=9070c60fa2e8814aa1535ec2188aedf51d46c632
monotone --db={your.database} diff 
--revision=e07b49a2f9e4b64abed0a859e58609c5e81e33e3 
--revision=9070c60fa2e8814aa1535ec2188aedf51d46c632
----------------------------------------------------------------------