[Monotone-commits-diffs] Revision 4e4bce6f8882474e61c4566be6be7cd103dcd56c

[monotone]

-----------------------------------------------------------------
Revision: 4e4bce6f8882474e61c4566be6be7cd103dcd56c
Ancestor: 0645728922ba60012ae05c4e3615c85d7b214139
Ancestor: 6c89615737385300ad9f6f6b08215b0c55c95530
Author: address@hidden
Date: 05/18/10 10:19:05
Branch: net.venge.monotone

Added files:
        maybe_workspace_updater.cc maybe_workspace_updater.hh
        tests/bad_and_unknown_certs/__driver__.lua
        tests/branch_leaves_sync_bug/__driver__.lua
        tests/catch_lua_output/__driver__.lua
        tests/catch_lua_output/hooks.lua
        tests/catch_lua_output/hooks_automate.lua
        tests/cert_no_branch/__driver__.lua
        tests/disapproving_a_non_head/__driver__.lua
        tests/log_with_windows_dirsep/__driver__.lua
        tests/merge_--update/__driver__.lua
Added directories:
        tests/bad_and_unknown_certs tests/branch_leaves_sync_bug
        tests/catch_lua_output tests/cert_no_branch
        tests/disapproving_a_non_head tests/log_with_windows_dirsep
        tests/merge_--update
Modified files:
        Makefile.am NEWS cmd_key_cert.cc cmd_merging.cc
        cmd_netsync.cc cmd_ws_commit.cc database.cc
        database_check.cc lua_hooks.cc monotone.texi options_list.hh
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/resolve_conflicts_all_resolutions/merge-1
        tests/resolve_conflicts_content/merge-1
        tests/resolve_conflicts_duplicate_name/merge-1
        tests/resolve_conflicts_none/merge-1
        tests/resolve_conflicts_propagate/propagate-1
        tests/resolve_conflicts_propagate/propagate-2
        tests/status/__driver__.lua tests/suspend/__driver__.lua

ChangeLog: 

merge of '0645728922ba60012ae05c4e3615c85d7b214139'
     and '6c89615737385300ad9f6f6b08215b0c55c95530'




monotone --db={your.database} diff 
--revision=0645728922ba60012ae05c4e3615c85d7b214139 
--revision=4e4bce6f8882474e61c4566be6be7cd103dcd56c
monotone --db={your.database} diff 
--revision=6c89615737385300ad9f6f6b08215b0c55c95530 
--revision=4e4bce6f8882474e61c4566be6be7cd103dcd56c
----------------------------------------------------------------------