[Monotone-commits-diffs] Revision 520b783aa134ff75afcd5658b04967ba50d9b712

[monotone]

-----------------------------------------------------------------
Revision: 520b783aa134ff75afcd5658b04967ba50d9b712
Ancestor: 2ee4101749dcec8f25adca7f9830d5e0b2c8be53
Ancestor: 3af5e83f9874d1cd221fedb644cce5fa6bf1dc94
Author: Timothy Brownawell  <address@hidden>
Date: 05/16/10 17:19:52
Branch: net.venge.monotone.bugfest-2010.17878-tbrownaw

Added files:
        maybe_workspace_updater.cc maybe_workspace_updater.hh
        tests/branch_leaves_sync_bug/__driver__.lua
        tests/disapproving_a_non_head/__driver__.lua
        tests/merge_--update/__driver__.lua
Added directories:
        tests/branch_leaves_sync_bug tests/disapproving_a_non_head
        tests/merge_--update
Modified files:
        Makefile.am NEWS cmd_key_cert.cc cmd_merging.cc
        cmd_netsync.cc cmd_ws_commit.cc options_list.hh
        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: 

propagate from branch 'net.venge.monotone' (head 
3af5e83f9874d1cd221fedb644cce5fa6bf1dc94)
            to branch 'net.venge.monotone.bugfest-2010.17878-tbrownaw' (head 
2ee4101749dcec8f25adca7f9830d5e0b2c8be53)


monotone --db={your.database} diff 
--revision=2ee4101749dcec8f25adca7f9830d5e0b2c8be53 
--revision=520b783aa134ff75afcd5658b04967ba50d9b712
monotone --db={your.database} diff 
--revision=3af5e83f9874d1cd221fedb644cce5fa6bf1dc94 
--revision=520b783aa134ff75afcd5658b04967ba50d9b712
----------------------------------------------------------------------