[Monotone-commits-diffs] Revision 80a51a9999b78edb2b5a6265327a9a6d779f4cb8

[monotone]

-----------------------------------------------------------------
Revision: 80a51a9999b78edb2b5a6265327a9a6d779f4cb8
Ancestor: 4a4a9762d1486e644ae8cc0f545a3ae82ab5c291
Author: address@hidden
Date: 2007-12-03T03:35:26
Branch: net.venge.monotone.cleanup.conflict-messages

Modified files:
        cmd_merging.cc diff_patch.cc diff_patch.hh merge.cc paths.hh
        roster.cc roster.hh roster_merge.cc roster_merge.hh
        tests/non_content_conflicts/__driver__.lua work.cc

ChangeLog: 

        * cmd_merging.cc (merge_into_dir):
        * diff_patch.{cc,hh} (content_merge_database_adaptor): add right marking
        map argument to constructor
        (content_merge_database_adaptor::get_ancestral_roster): return
        revision_id for associated roster; search both left and right marking
        map for given node id; required because the node id may have been added
        on one side below the merge lca
        (content_merge_workspace_adaptor::get_ancestral_roster):
        (content_merge_adaptor::get_ancestral_roster): return revision_id for
        associated roster; update workspace and adatabase adaptors to conform to
        new interface
        * merge.cc (resolve_merge_conflicts): pass content_merge_adaptor
        to warn_non_content_conflicts for generating detailed conflict
        messages; return revision_id from get_ancestral_roster
        (interactive_merge_and_store): add right marking map to database
        adaptor constructor
        * paths.hh (file_path::operator!=): add != operator for
        convenience
        * roster.{cc,hh} (dump): specialize dump for node_id
        (is_attached): new function to determine if a node_id is attached
        in a roster
        * roster_merge.{cc,hh} (dump): specialize dump for various
        conflict types
        (warn_non_content_conflicts): add content_merge_adaptor argument
        for getting ancestral rosters; rework all the non-content conflict
        errors to be much more user friendly
        * tests/non_content_conflicts/__driver__.lua: update for changed formats
        of conflict errors; add a few more specialized error tests 
        * work.cc (content_merge_empty_adaptor::get_ancestral_roster): return
        revision_id for associated roster

txtEQSTjNEGT3.txt
Description: Diff [4a4a9762d1486e644ae8cc0f545a3ae82ab5c291] -> [80a51a9999b78edb2b5a6265327a9a6d779f4cb8]