[Monotone-commits-diffs] Revision 22e7293a23468d5e222e7eb6fd08e76796c73704

[monotone]

-----------------------------------------------------------------
Revision: 22e7293a23468d5e222e7eb6fd08e76796c73704
Ancestor: 8b391bf115b6fa078a79480ec0a9eaa6b188bb20
Author: address@hidden
Date: 2007-12-09T05:58:27
Branch: net.venge.monotone.cleanup.conflict-messages

Deleted entries:
        tests/show_conflicts tests/show_conflicts/__driver__.lua
Renamed entries:
        tests/non_content_conflicts to tests/conflict_messages
Modified files:
        cmd_merging.cc merge.cc roster_merge.cc roster_merge.hh
        sanity.hh tests/conflict_messages/__driver__.lua

ChangeLog: 

        * cmd_merging.cc (merge_into_workspace): display left/right
        revision ids
        (show_conflicts): replace conflict counts with calls to report
        detailed conflict information for all conflict types
        * merge.cc (resolve_merge_conflicts): replace single call to
        report all non-content conflicts with specific calls for each
        conflict type, including content conflicts; display all content
        conflicts before starting to resolve them
        * roster_merge.{cc,hh} (dump): add conflict type information to
        specialized conflict dump functions and tweak formatting; change
        specialized roster_merge_result dump to use dump_conflicts
        (debug_describe_conflicts): replace with ...
        (dump_conflicts): ... this which makes use of available dump
        functions
        (roster_merge_result::log_conflicts): change to use dump_conflicts
        (roster_merge_result::warn_non_content_conflicts): split into
        individual functions for each conflict type
        (roster_merge_result::report_multiple_name_conflicts):
        (roster_merge_result::report_attribute_conflicts):
        (roster_merge_result::report_orphaned_node_conflicts):
        (roster_merge_result::report_duplicate_name_conflicts):
        (roster_merge_result::report_directory_loop_conflicts):
        (roster_merge_result::report_invalid_name_conflicts):
        (roster_merge_result::report_missing_root_conflicts): new
        functions split out from warn_non_content_conflicts
        (roster_merge_result::report_file_content_conflicts): new function
        for reporting file content conflicts
        * sanity.hh (dump): specialize dump for vector of dumpable types
        * tests/non_content_conflicts/__driver__.lua: add --debug option
        to update tests to see what new conflict dump output looks like;
        keep revision ids of both merge candidates for use with
        show_conflicts; add test of show_conflicts to each conflict case;
        add tests for file content conflicts

txtoSKX_OToLj.txt
Description: Diff [8b391bf115b6fa078a79480ec0a9eaa6b188bb20] -> [22e7293a23468d5e222e7eb6fd08e76796c73704]