[Monotone-commits-diffs] Revision fe760bf3fd74449943698f8afd557259eea4f191

[monotone]

-----------------------------------------------------------------
Revision: fe760bf3fd74449943698f8afd557259eea4f191
Ancestor: 045b74fe061d4fb0925f7c6b0ca1fd61340bca87
Author: address@hidden
Date: 2008-05-17T19:13:19
Branch: net.venge.monotone.automate_show_conflict

Modified files:
        monotone.texi revision.cc roster.hh
        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
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout

ChangeLog: 

Fix test failures due to automate show_conflict format change.

* revision.cc: New constant current_revision_format; leave at 1 to
  distinguish test failures due to bumping it to 2 from other test
  failures.
  (print_insane_revision): Use it.
  (parse_revision): Use it.

* roster.hh (struct node): Fix comment to allow future user suture
  command.

* monotone.texi: Update automate show_conflict documentation to current format.

* tests/automate_show_conflicts/expected-*: Match au show_conflict format
  change.

* tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout:
  Match au show_conflict format change.

txtUmkOgeEIiT.txt
Description: Diff [045b74fe061d4fb0925f7c6b0ca1fd61340bca87] -> [fe760bf3fd74449943698f8afd557259eea4f191]