[Monotone-commits-nodiffs] Revision b6fc89d5d26677e8db8e84f4fd42a035613f5ede

[monotone]

-----------------------------------------------------------------
Revision: b6fc89d5d26677e8db8e84f4fd42a035613f5ede
Ancestor: 25d76182286bccd52c355d6770414c62065c823b
Ancestor: a61e3ace2e983073ab229355351233183a17c9b4
Author: Richard Levitte <address@hidden>
Date: 2008-05-08T09:57:57
Branch: net.venge.monotone.experiment.meta-selector

Renamed entries:
        contrib/mtnopt to util/mtnopt
        tests/clone_-b_no_dir to tests/clone_branch_no_dir
Added files:
        contrib/monotone-inotify.lua
        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/meta_selector_heads_of_certs/__driver__.lua
        tests/meta_selector_latest_common_ancestor/__driver__.lua
        tests/resolve_duplicate_name_conflict/__driver__.lua
        tests/util_mtnopt/__driver__.lua
Added directories:
        tests/automate_get_options tests/automate_show_conflicts
        tests/automate_show_conflicts_defaults
        tests/meta_selector_heads_of_certs
        tests/meta_selector_latest_common_ancestor
        tests/resolve_duplicate_name_conflict tests/util_mtnopt util
Modified files:
        .mtn-ignore Makefile.am NEWS automate.cc cmd_automate.cc
        cmd_merging.cc cmd_netsync.cc
        contrib/monotone.bash_completion diff_patch.cc diff_patch.hh
        examples/display_branches.lua lua-testsuite.lua merge.cc
        monotone.texi paths.cc po/de.po po/es.po po/sv.po refiner.cc
        roster_merge.cc roster_merge.hh selectors.cc
        tests/automate_cert/__driver__.lua
        tests/automate_heads/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/automate_inventory_options/__driver__.lua
        tests/automate_inventory_options/expected-no-ignored.stdout
        tests/automate_inventory_options/expected-no-unchanged.stdout
        tests/automate_inventory_options/expected-no-unknown.stdout
        tests/automate_inventory_options/expected-none.stdout
        tests/automate_inventory_options/expected-renames-both.stdout
        
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
        
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
        tests/automate_inventory_options/expected-renames-target.stdout
        tests/automate_inventory_restricted/__driver__.lua
        tests/automate_keys/__driver__.lua
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_branch_no_dir/__driver__.lua
        tests/clone_creates__MTN_log/__driver__.lua
        tests/clone_creates_right__MTN_options/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/common/test_utils_inventory.lua
        tests/conflict_messages/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
25d76182286bccd52c355d6770414c62065c823b)
            to branch 'net.venge.monotone.experiment.meta-selector' (head 
a61e3ace2e983073ab229355351233183a17c9b4)


monotone --db={your.database} diff 
--revision=25d76182286bccd52c355d6770414c62065c823b 
--revision=b6fc89d5d26677e8db8e84f4fd42a035613f5ede
monotone --db={your.database} diff 
--revision=a61e3ace2e983073ab229355351233183a17c9b4 
--revision=b6fc89d5d26677e8db8e84f4fd42a035613f5ede
----------------------------------------------------------------------