[Monotone-commits-diffs] Revision aebb88e9030d0e5616d1974a1ed9755cf176ffea

[monotone]

-----------------------------------------------------------------
Revision: aebb88e9030d0e5616d1974a1ed9755cf176ffea
Ancestor: 1665cb0edf39aff61df8bd3ba1b5c5115fbb874f
Ancestor: ecc726c335b0abbedb82350052fd050dbf20c847
Author: address@hidden
Date: 2009-08-21T20:06:46
Branch: net.venge.monotone

Deleted entries:
        tests/netsync_stops_on_key_id_clash
        tests/netsync_stops_on_key_id_clash/__driver__.lua
Added files:
        tests/duplicate_key_id/local_name.lua
Modified files:
        Makefile.am NEWS annotate.cc automate.cc base.hh cert.cc
        cert.hh charset.cc charset.hh cmd_db.cc cmd_key_cert.cc
        cmd_list.cc cmd_merging.cc cmd_netsync.cc cmd_othervcs.cc
        cmd_packet.cc cmd_ws_commit.cc configure.ac constants.hh
        database.cc database.hh database_check.cc git_export.cc
        key_store.cc key_store.hh keys.cc keys.hh lua_hooks.cc
        lua_hooks.hh migrate_ancestry.cc migrate_schema.cc
        migration.hh monotone.texi netcmd.cc netcmd.hh netsync.cc
        options_list.hh packet.cc packet.hh project.cc project.hh
        sanity.cc schema.sql std_hooks.lua testlib.lua
        tests/automate_cert/expected tests/automate_certs/expected
        tests/automate_inventory_options/test_hooks.lua
        tests/automate_keys/__driver__.lua
        tests/changing_passphrase_of_a_private_key/__driver__.lua
        tests/commit_default_editor/test_hooks.lua
        tests/common/netsync-hooks_with_notes.lua
        tests/creating_a_bad_criss-cross_merge/alice.lua
        tests/creating_a_bad_criss-cross_merge/bob.lua
        tests/database_check/__driver__.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/do_not_log_the_result_of_hook_get_passphrase/hook.lua
        tests/drop_a_public_and_private_key/__driver__.lua
        tests/drop_a_public_key/__driver__.lua
        tests/duplicate_key_id/__driver__.lua
        tests/generating_and_extracting_keys_and_certs/__driver__.lua
        tests/importing_cvs_tricky_repo_with_tags/test.tags
        tests/key_files_created_securely/__driver__.lua
        tests/min_hooks.lua
        tests/netsync_duplicate_keys/__driver__.lua
        tests/netsync_permissions/__driver__.lua
        tests/read_and_convert_old_privkey_packet/__driver__.lua
        tests/ssh_agent/__driver__.lua tests/test_hooks.lua
        tests/trust_hooks_and_trusted_command/__driver__.lua
        unit-tests/netcmd.cc unit-tests/packet.cc update.cc vocab.cc
        vocab_terms.hh work.cc

ChangeLog: 

merge of '1665cb0edf39aff61df8bd3ba1b5c5115fbb874f'
     and 'ecc726c335b0abbedb82350052fd050dbf20c847'


monotone --db={your.database} diff 
--revision=1665cb0edf39aff61df8bd3ba1b5c5115fbb874f 
--revision=aebb88e9030d0e5616d1974a1ed9755cf176ffea
monotone --db={your.database} diff 
--revision=ecc726c335b0abbedb82350052fd050dbf20c847 
--revision=aebb88e9030d0e5616d1974a1ed9755cf176ffea
----------------------------------------------------------------------