[Monotone-commits-diffs] Revision b165cc85594d5814adf044f7d13e4f21af2e4953

[monotone]

-----------------------------------------------------------------
Revision: b165cc85594d5814adf044f7d13e4f21af2e4953
Ancestor: 280779a51cbfc28b7c59f8fe84dd084035febb5d
Ancestor: 9b61bfe31cd918c53dc2a46d0fd9cb85f89a1956
Author: Timothy Brownawell  <address@hidden>
Date: 02/17/2010 05:15:09 AM
Branch: net.venge.monotone.tbrownaw.pull-reduced-sanity

Added files:
        tests/git_export_invalid_mapped_author/__driver__.lua
        tests/git_export_unmapped_authors/__driver__.lua
        tests/netsync_stop_server/__driver__.lua
Added directories:
        tests/git_export_invalid_mapped_author
        tests/git_export_unmapped_authors tests/netsync_stop_server
Modified files:
        NEWS ancestry.cc annotate.cc automate.cc cache_logger.cc
        cache_logger.hh cmd_diff_log.cc cmd_merging.cc
        cmd_netsync.cc cmd_othervcs.cc constants.hh
        contrib/command/remote_export.lua
        contrib/monotone-cluster-push.lua
        contrib/monotone-mail-notify.lua contrib/monotone-mirror.lua
        cow_trie.hh database.cc database.hh database_check.cc
        git_export.cc git_export.hh key_store.cc lua-testsuite.lua
        lua_hooks.cc lua_hooks.hh merge_content.cc merge_roster.cc
        migrate_ancestry.cc monotone.texi netsync.cc
        network/reactor.cc options_list.hh rev_types.hh roster.cc
        roster.hh roster_delta.cc roster_delta.hh std_hooks.lua
        testlib.lua tests/automate_tags/__driver__.lua
        tests/commit_default_editor/test_hooks.lua
        tests/commit_use_workspace_keydir/__driver__.lua
        tests/common/netsync.lua
        tests/creating_a_bad_criss-cross_merge/__driver__.lua
        tests/database_check/__driver__.lua
        tests/db_execute/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/git_export/__driver__.lua
        tests/git_export_rename_loop/__driver__.lua
        tests/manifest_restrictions/__driver__.lua
        tests/netsync_negotiation/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/short_options_work_correctly/__driver__.lua
        tests/trust_hooks_and_trusted_command/__driver__.lua
        unit-tests/merge_roster.cc unit-tests/roster.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
280779a51cbfc28b7c59f8fe84dd084035febb5d)
            to branch 'net.venge.monotone.tbrownaw.pull-reduced-sanity' (head 
9b61bfe31cd918c53dc2a46d0fd9cb85f89a1956)


monotone --db={your.database} diff 
--revision=280779a51cbfc28b7c59f8fe84dd084035febb5d 
--revision=b165cc85594d5814adf044f7d13e4f21af2e4953
monotone --db={your.database} diff 
--revision=9b61bfe31cd918c53dc2a46d0fd9cb85f89a1956 
--revision=b165cc85594d5814adf044f7d13e4f21af2e4953
----------------------------------------------------------------------