[Monotone-commits-diffs] Revision ecb98e786309c5ca374a4ad9bed7699329054b46

[monotone]

-----------------------------------------------------------------
Revision: ecb98e786309c5ca374a4ad9bed7699329054b46
Ancestor: 0a0689cf445801a1027b984daca895b823833ff6
Ancestor: a12de622941133632092d1cf8d84859f01042ae1
Author: address@hidden
Date: 2005-12-27T18:27:28
Branch: net.venge.monotone.experiment.rosters.restrictions

Deleted files:
        botan/socket.h manifest.cc manifest.hh
Renamed files:
        botan/parse.cpp to botan/parsing.cpp
Added files:
        botan/bit_ops.cpp botan/bit_ops.h botan/out_buf.cpp
        botan/out_buf.h botan/parsing.h enumerator.cc enumerator.hh
        legacy.cc legacy.hh po/pt_BR.po refiner.cc refiner.hh
        tests/t_mixed_case_pwd.at tests/t_read_privkey.at
        tests/t_rosterify_rename.at
Modified files:
        AUTHORS ChangeLog HACKING Makefile.am annotate.cc
        app_state.cc app_state.hh automate.cc 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 constants.cc constants.hh
        contrib/usher.cc cset.cc database.cc database.hh
        inodeprint.cc key_store.cc merkle_tree.cc merkle_tree.hh
        monotone.texi netcmd.cc netcmd.hh netsync.cc
        netxx/serverbase.cxx netxx/sockopt.cxx netxx/sockopt.h
        packet.cc packet.hh paths.cc paths.hh po/LINGUAS po/fr.po
        rcs_import.cc restrictions.cc restrictions.hh revision.cc
        revision.hh roster.cc roster.hh roster_merge.cc safe_map.hh
        sanity.cc schema_migration.cc std_hooks.lua tests/README
        tests/t_add_dot.at tests/t_attr.at tests/t_attr_drop.at
        tests/t_attr_init.at tests/t_attributes.at
        tests/t_automate_get_manifest_of.at
        tests/t_automate_get_revision.at
        tests/t_automate_inventory.at tests/t_cvsimport_drepper.at
        tests/t_cvsimport_drepper2.at
        tests/t_database_sig_cleanup.at tests/t_dropkey_2.at
        tests/t_merge_manual.at tests/t_migrate_schema.at
        tests/t_netsync_nocerts.at tests/t_rename.at
        tests/t_restrictions.at tests/t_revert.at
        tests/t_revert_restrict.at tests/t_rosterify_attrs.at
        tests/t_scan.at tests/t_selector_later_earlier.at
        tests/t_status.at tests/t_subdir_attr.at testsuite.at
        transforms.cc ui.cc ui.hh unit_tests.cc unit_tests.hh
        unix/process.cc update.cc update.hh win32/fs.cc work.cc
        work.hh xdelta.hh

ChangeLog: 

explicit_merge of '0a0689cf445801a1027b984daca895b823833ff6'
              and 'a12de622941133632092d1cf8d84859f01042ae1'
   using ancestor '77e9e3418942b2e7080b8475527425b584f5b303'
        to branch 'net.venge.monotone.experiment.rosters.restrictions'


monotone --db={your.database} diff 
--revision=0a0689cf445801a1027b984daca895b823833ff6 
--revision=ecb98e786309c5ca374a4ad9bed7699329054b46
monotone --db={your.database} diff 
--revision=a12de622941133632092d1cf8d84859f01042ae1 
--revision=ecb98e786309c5ca374a4ad9bed7699329054b46
----------------------------------------------------------------------