-----------------------------------------------------------------
Revision: d0b88107c3efa4199675d63df9b4d288821fe3f7
Ancestor: 2e69712dc77a9bc7e43d37d14c7f99dcdc6d447b
Ancestor: 7b45fb91b5741bfe67b646cb2a7c5f71d45778a2
Author: Timothy Brownawell <[email protected]>
Date: 2009-06-17T11:49:17
Branch: net.venge.monotone.keys-by-hash
Modified files:
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 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.cc netcmd.cc netcmd.hh netsync.cc options_list.hh
packet.cc packet.hh project.cc project.hh sanity.cc
schema.sql std_hooks.lua tester-plaf.hh tester.cc
testlib.lua tests/automate_cert/expected
tests/automate_certs/expected
tests/automate_inventory_options/test_hooks.lua
tests/commit_default_editor/test_hooks.lua
tests/database_check/__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/min_hooks.lua
tests/test_hooks.lua txt2c.cc ui.cc ui.hh
unit-tests/netcmd.cc unit-tests/packet.cc
unix/tester-plaf.cc update.cc vocab.cc vocab_terms.hh
win32/tester-plaf.cc work.cc
ChangeLog:
Merge in mainline changes.
monotone --db={your.database} diff
--revision=2e69712dc77a9bc7e43d37d14c7f99dcdc6d447b
--revision=d0b88107c3efa4199675d63df9b4d288821fe3f7
monotone --db={your.database} diff
--revision=7b45fb91b5741bfe67b646cb2a7c5f71d45778a2
--revision=d0b88107c3efa4199675d63df9b4d288821fe3f7
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
