[Monotone-commits-diffs] Revision f8dac2d302b4bb8f7d91432b5da53a8aec061410

[monotone]

-----------------------------------------------------------------
Revision: f8dac2d302b4bb8f7d91432b5da53a8aec061410
Ancestor: 12e65c6cf5e7defab8eff71f270c1e3e29986a29
Author: address@hidden
Date: 2008-03-27T08:28:45
Branch: net.venge.monotone.automate_show_conflict

Added files:
        tests/automate_show_conflicts/expected-attribute-attached.stdout
        tests/automate_show_conflicts/expected-attribute-detached.stdout
Modified files:
        roster_merge.cc

ChangeLog: 

automate show_conflicts: add support for attribute conflicts

* roster_merge.cc (put_attr_state_left, put_attr_state_right,
  put_attr_conflict): new basic_io output functions.
  (roster_merge_result::report_attribute_conflicts): Use them.

* tests/automate_show_conflicts/expected-attribute-attached.stdout: New file.

* tests/automate_show_conflicts/expected-attribute-detached.stdout: New file.

txt60rodp2Ysj.txt
Description: Diff [12e65c6cf5e7defab8eff71f270c1e3e29986a29] -> [f8dac2d302b4bb8f7d91432b5da53a8aec061410]