[Monotone-commits-diffs] Revision 716f47c175116dda660d99f346fab062be1c8fc2

[monotone]

-----------------------------------------------------------------
Revision: 716f47c175116dda660d99f346fab062be1c8fc2
Ancestor: 19f1ecd579f412a8b2c98f6d0de48f5cbccd9dfd
Ancestor: ecc7c72d1f9d7ecfee0ee4c6b60694d056880ef6
Author: address@hidden
Date: 2008-05-07T08:58:31
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Added files:
        tests/automate_get_options/__driver__.lua
        tests/automate_show_conflicts/__driver__.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/automate_show_conflicts_defaults/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
        tests/resolve_duplicate_name_conflict/__driver__.lua
Added directories:
        tests/automate_get_options tests/automate_show_conflicts
        tests/automate_show_conflicts_defaults
        tests/resolve_duplicate_name_conflict
Modified files:
        NEWS automate.cc cmd_automate.cc cmd_merging.cc
        contrib/monotone.bash_completion diff_patch.cc diff_patch.hh
        examples/display_branches.lua lua-testsuite.lua merge.cc
        monotone.texi paths.cc rcs_import.cc roster_merge.cc
        roster_merge.hh tests/automate_cert/__driver__.lua
        tests/automate_heads/__driver__.lua
        tests/automate_keys/__driver__.lua
        tests/common/test_utils_inventory.lua
        tests/conflict_messages/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        tests/util_mtnopt/__driver__.lua

ChangeLog: 

merge of '19f1ecd579f412a8b2c98f6d0de48f5cbccd9dfd'
     and 'ecc7c72d1f9d7ecfee0ee4c6b60694d056880ef6'


monotone --db={your.database} diff 
--revision=19f1ecd579f412a8b2c98f6d0de48f5cbccd9dfd 
--revision=716f47c175116dda660d99f346fab062be1c8fc2
monotone --db={your.database} diff 
--revision=ecc7c72d1f9d7ecfee0ee4c6b60694d056880ef6 
--revision=716f47c175116dda660d99f346fab062be1c8fc2
----------------------------------------------------------------------