[Monotone-commits-diffs] Revision c51b5a751598aaa3357af720f1be457535f5917b

[monotone]

-----------------------------------------------------------------
Revision: c51b5a751598aaa3357af720f1be457535f5917b
Ancestor: 38bf5086d25180ea3508d45cc8e8b29a97bf5726
Ancestor: 96db4b9c0fa0ed1203842d760b2c490ad474db13
Author: Richard Levitte <address@hidden>
Date: 2008-05-22T15:12:30
Branch: net.venge.monotone

Added files:
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stdout
Modified files:
        HACKING NEWS asciik.cc automate.cc basic_io.cc basic_io.hh
        cmd_files.cc database.cc examples/display_branches.lua
        luaext_parse_basic_io.cc monotone.texi options_list.hh
        roster.cc roster_merge.cc tester.cc
        tests/automate_identify/__driver__.lua
        tests/automate_inventory_ignore_dirs/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/local_hooks.lua
        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
        tests/resolve_duplicate_name_conflict/__driver__.lua

ChangeLog: 

merge of '38bf5086d25180ea3508d45cc8e8b29a97bf5726'
     and '96db4b9c0fa0ed1203842d760b2c490ad474db13'


monotone --db={your.database} diff 
--revision=38bf5086d25180ea3508d45cc8e8b29a97bf5726 
--revision=c51b5a751598aaa3357af720f1be457535f5917b
monotone --db={your.database} diff 
--revision=96db4b9c0fa0ed1203842d760b2c490ad474db13 
--revision=c51b5a751598aaa3357af720f1be457535f5917b
----------------------------------------------------------------------