[Monotone-commits-nodiffs] Revision 460314039a4bab88772ed47fced4055329f43dbd

[monotone]

-----------------------------------------------------------------
Revision: 460314039a4bab88772ed47fced4055329f43dbd
Ancestor: 18b2d521bbb4671537ebfbaf8d79e2bc099cabbf
Author: address@hidden
Date: 2007-11-10T06:36:59
Branch: net.venge.monotone.cleanup.conflict-messages

Modified files:
        merge.cc roster_merge.cc
        tests/non_content_conflicts/__driver__.lua

ChangeLog: 

        * merge.cc (resolve_merge_conflicts): remove redundant message
        * roster_merge.cc (debug_describe_conflicts): reformat overly long
        string; change "name conflict" to "divergent name conflict";
        change "rename target conflict" to "convergent name conflict"
        (get_type): new function
        (roster_merge_result::warn_non_content_conflicts): reformat
        attribute conflict messages and include file/directory type
        * tests/non_content_conflicts/__driver__.lua: avoid use of "left"
        and "right" in attribute values



monotone --db={your.database} diff 
--revision=18b2d521bbb4671537ebfbaf8d79e2bc099cabbf 
--revision=460314039a4bab88772ed47fced4055329f43dbd
----------------------------------------------------------------------