[Monotone-commits-diffs] Revision 3e61a21f0d48e7a9ca4aa1e20a0788904a4f5f65

[monotone]

-----------------------------------------------------------------
Revision: 3e61a21f0d48e7a9ca4aa1e20a0788904a4f5f65
Ancestor: 80a51a9999b78edb2b5a6265327a9a6d779f4cb8
Author: address@hidden
Date: 2007-12-07T05:03:45
Branch: net.venge.monotone.cleanup.conflict-messages

Modified files:
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc diff_patch.cc
        diff_patch.hh roster_merge.cc sanity.hh
        tests/non_content_conflicts/__driver__.lua

ChangeLog: 

        * cmd_merging.cc (three_way_merge): add revision_id parameters and
        use these in place of fake_id's; add left/right marking map output
        parameters for use with content_merge_workspace_adaptor
        (update, merge_into_workspace, pluck):
        change working_roster to a shared_ptr suitable for
        caching in content_merge_workspace_adaptor; calculate revision id
        of current workspace for reporting conflicts; pass revision ids
        and marking maps to three_way_merge; cache workspace roster in
        content_merge_workspace_adaptor;
        * cmd_netsync.cc (clone):
        * cmd_ws_commit.cc (checkout): replace
        content_merge_workspace_adaptor with simplified
        content_merge_checkout_adaptor
        * diff_patch.{cc,hh}
        (content_merge_workspace_adaptor): add lca roster, marking maps
        and roster cache for node lookups similar to database adaptor
        (content_merge_workspace_adaptor::cache_roster): new method for
        adding rosters to the adaptor cache
        (content_merge_workspace_adaptor::get_ancestral_roster): add
        marking map and cached roster lookups for node ids
        (content_merge_checkout_adaptor): simplified adaptor
        implementation for use by checkout and clone
        * roster_merge.cc (dump): improve output of various conflict dump
        methods
        * sanity.hh (print_var): change type of var argument to match
        implementation in sanity.cc
        * tests/non_content_conflicts/__driver__.lua: add update, pluck
        and merge_into_workspace message tests for all non-content
        conflict types

txt1ddStp0dYz.txt
Description: Diff [80a51a9999b78edb2b5a6265327a9a6d779f4cb8] -> [3e61a21f0d48e7a9ca4aa1e20a0788904a4f5f65]