[Monotone-commits-diffs] Revision d010ab2f6d09aa533d78b8a093a9d727fa40f5e3

[monotone]

-----------------------------------------------------------------
Revision: d010ab2f6d09aa533d78b8a093a9d727fa40f5e3
Ancestor: e47fedf9ef19c2fdd512192ca55aced95453e4ef
Ancestor: e893fff9bd48f5bec46a1fb338d4b36ab8c898cb
Author: address@hidden
Date: 2005-10-08T07:58:25
Branch: net.venge.monotone

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 key_store.cc key_store.hh
        tests/t_add_inside_MT.at tests/t_automate_keys.at
        tests/t_key_management_without_db.at
Modified files:
        ChangeLog Makefile.am 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.hh
        commands.cc database.cc database.hh file_io.cc file_io.hh
        keys.cc keys.hh lua.cc lua.hh main.cc 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 'e47fedf9ef19c2fdd512192ca55aced95453e4ef'
              and 'e893fff9bd48f5bec46a1fb338d4b36ab8c898cb'
   using ancestor '5a9155ecf7645dd66407c3596eb7dd5b2afbcb44'
        to branch 'net.venge.monotone'


monotone --db={your.database} diff 
--revision=e47fedf9ef19c2fdd512192ca55aced95453e4ef 
--revision=d010ab2f6d09aa533d78b8a093a9d727fa40f5e3
monotone --db={your.database} diff 
--revision=e893fff9bd48f5bec46a1fb338d4b36ab8c898cb 
--revision=d010ab2f6d09aa533d78b8a093a9d727fa40f5e3
----------------------------------------------------------------------