[Monotone-commits-diffs] Revision a044205899e73fc4396a69c45f299166681776d2

[monotone]

-----------------------------------------------------------------
Revision: a044205899e73fc4396a69c45f299166681776d2
Ancestor: 3c02df70127e16670f8862972b9bd6389efd8c69
Ancestor: 4c00ba14ea02def9b11d83a98ec407cbde01a658
Author: address@hidden
Date: 2005-10-08T08:42:01
Branch: net.venge.monotone.formatting

Deleted files:
        unix/platform_netsync.cc win32/platform_netsync.cc
Added files:
        botan/des.cpp botan/des.h botan/des_tab.cpp botan/pkcs5.cpp
        botan/pkcs5.h format.cc format.hh key_store.cc key_store.hh
        tests/t_add_inside_MT.at tests/t_automate_format.at
        tests/t_automate_keys.at
        tests/t_key_management_without_db.at
Modified files:
        ChangeLog Makefile.am annotate.cc app_state.cc app_state.hh
        automate.cc basic_io.cc basic_io.hh botan/algolist.cpp
        botan/def_alg.cpp botan/pkcs8.cpp botan/pkcs8.h cert.cc
        cert.hh change_set.cc change_set.hh commands.cc
        contrib/ciabot_monotone.py database.cc database.hh
        file_io.cc file_io.hh keys.cc keys.hh lua.cc lua.hh main.cc
        monotone.1 monotone.cc monotone.texi netsync.cc options.hh
        packet.cc packet.hh paths.cc platform.hh sanity.cc
        schema.sql schema_migration.cc schema_migration.hh
        std_hooks.lua tests/t_cross.at
        tests/t_database_check_normalized.at tests/t_lua_privkey.at
        tests/t_migrate_schema.at tests/t_mt_ignore.at
        tests/t_netsync_absorbs.at
        tests/t_netsync_checks_server_key.at
        tests/t_netsync_permissions.at tests/t_netsync_pubkey.at
        tests/t_netsync_unrelated.at tests/t_short_opts.at
        tests/t_subdirs.at testsuite.at ui.cc unix/fs.cc vocab.cc
        vocab.hh vocab_terms.hh win32/fs.cc

ChangeLog: 

explicit_merge of '3c02df70127e16670f8862972b9bd6389efd8c69'
              and '4c00ba14ea02def9b11d83a98ec407cbde01a658'
   using ancestor '7f6a8a919067e0afbdaca8024c16f8f1fa1ebf4e'
        to branch 'net.venge.monotone.formatting'


monotone --db={your.database} diff 
--revision=3c02df70127e16670f8862972b9bd6389efd8c69 
--revision=a044205899e73fc4396a69c45f299166681776d2
monotone --db={your.database} diff 
--revision=4c00ba14ea02def9b11d83a98ec407cbde01a658 
--revision=a044205899e73fc4396a69c45f299166681776d2
----------------------------------------------------------------------