[Monotone-commits-diffs] Revision 2ee4101749dcec8f25adca7f9830d5e0b2c8be53

[monotone]

-----------------------------------------------------------------
Revision: 2ee4101749dcec8f25adca7f9830d5e0b2c8be53
Ancestor: 21ee0754448a471cc15bb4687e07d79edadde39e
Ancestor: 262081957fffe7c10e2a31a92f2fc14d3b43eac3
Author: Timothy Brownawell  <address@hidden>
Date: 05/16/10 17:18:46
Branch: net.venge.monotone.bugfest-2010.17878-tbrownaw

Renamed entries:
        tests/commit_using__MTN_log/commit_log.lua to 
tests/commit_using__MTN_log/commit_cancelled.lua
        tests/commit_using__MTN_log/commit_log_modified_return.lua to 
tests/commit_using__MTN_log/commit_confirmed.lua
Added files:
        maybe_workspace_updater.cc maybe_workspace_updater.hh
        tests/db_check_branch_leaves/__driver__.lua
        tests/disapproving_a_non_head/__driver__.lua
        tests/log_recognizes_invalid_workspace_parent/__driver__.lua
        tests/merge_--update/__driver__.lua
Added directories:
        tests/db_check_branch_leaves tests/disapproving_a_non_head
        tests/log_recognizes_invalid_workspace_parent
        tests/merge_--update
Modified files:
        Makefile.am NEWS cmd_key_cert.cc cmd_list.cc cmd_merging.cc
        cmd_netsync.cc cmd_ws_commit.cc database.cc database.hh
        database_check.cc key_store.cc migrate_ancestry.cc
        monotone.texi options_list.hh packet.cc
        tests/changelog_editor/__driver__.lua
        tests/commit_using__MTN_log/__driver__.lua
        tests/commit_using__MTN_log/commit_cancelled.lua
        tests/db_kill_tag_locally/__driver__.lua
        tests/importing_cvs_tricky_repo_with_tags/test.tags
        tests/ls_tags_with_ambiguous_tags/__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
        tests/tags_and_tagging_of_revisions/__driver__.lua work.cc
        work.hh

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=21ee0754448a471cc15bb4687e07d79edadde39e 
--revision=2ee4101749dcec8f25adca7f9830d5e0b2c8be53
monotone --db={your.database} diff 
--revision=262081957fffe7c10e2a31a92f2fc14d3b43eac3 
--revision=2ee4101749dcec8f25adca7f9830d5e0b2c8be53
----------------------------------------------------------------------