[Monotone-commits-diffs] Revision e53cb5be5ceb43d67688d163019d9015c79f5709

[monotone]

-----------------------------------------------------------------
Revision: e53cb5be5ceb43d67688d163019d9015c79f5709
Ancestor: 1992323b917a7e8d0bd4d2266d8e7ba4cb081979
Author: address@hidden
Date: 2008-05-18T15:39:05
Branch: net.venge.monotone

Modified files:
        basic_io.cc basic_io.hh monotone.texi roster_merge.cc
        tests/automate_show_conflicts/expected-attribute-attached.stdout
        tests/automate_show_conflicts/expected-attribute-detached.stdout
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/automate_show_conflicts/expected-content-detached.stdout
        tests/automate_show_conflicts/expected-directory-loop.stdout
        tests/automate_show_conflicts/expected-duplicate-add-rename.stdout
        tests/automate_show_conflicts/expected-duplicate-adds.stdout
        
tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout
        tests/automate_show_conflicts/expected-duplicate-renames.stdout
        tests/automate_show_conflicts/expected-invalid-add.stdout
        tests/automate_show_conflicts/expected-invalid-rename.stdout
        tests/automate_show_conflicts/expected-missing-root.stdout
        
tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout
        
tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout
        tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout
        tests/automate_show_conflicts/expected-multiple-names.stdout
        tests/automate_show_conflicts/expected-orphaned-add.stdout
        tests/automate_show_conflicts/expected-orphaned-rename.stdout
        tests/automate_show_conflicts/expected-unrelated-projects.stdout

ChangeLog: 

Change automate show_conflicts output format slightly, to make it easier to 
parse; 'conflict "foo bar"' => 'conflict foo_bar'

* basic_io.hh: 
* basic_io.cc (stanza::push_str_pair (symbol, symbol): New function.

* monotone.texi (Automation show_conflicts): Doc change in format.

* roster_merge.cc (namespace syms): Declare symbols for each conflict type.
  (put_added_conflict_right, put_rename_conflict_left) 
  (put_rename_conflict_right, put_attr_conflict, put_content_conflict) 
  (put_added_conflict_left): Use push_file_pair as appropriate
  (roster_merge_result::report_missing_root_conflicts): Put 'conflict <symbol>'

* tests/automate_show_conflicts/expected-*.stdout: Match new format

txtus6RL8Vao3.txt
Description: Diff [1992323b917a7e8d0bd4d2266d8e7ba4cb081979] -> [e53cb5be5ceb43d67688d163019d9015c79f5709]