[Monotone-commits-diffs] Revision 6f166933d80a5d0dc86afb3d9c7e307d775ee21d

[monotone]

-----------------------------------------------------------------
Revision: 6f166933d80a5d0dc86afb3d9c7e307d775ee21d
Ancestor: 15be8e6d3d9a788a082c6305084d3381e4c40ff7
Ancestor: c4c9fd954ede200a16696ffe5811756445041c05
Author: address@hidden
Date: 2008-05-04T09:48:41
Branch: net.venge.monotone
Branch: net.venge.monotone.automate_show_conflict

Renamed entries:
        tests/clone_-b_no_dir to tests/clone_branch_no_dir
Added files:
        contrib/monotone-inotify.lua cygwin/monotone-0.40-1.cygport
        cygwin/monotone-0.40-1.cygwin.patch
        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/i_selector/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
        tests/netsync_stops_on_key_id_clash/__driver__.lua
        tests/resolve_duplicate_name_conflict/__driver__.lua
        tests/util_mtnopt/__driver__.lua util/mtnopt
Added directories:
        cygwin tests/automate_get_options
        tests/automate_show_conflicts
        tests/automate_show_conflicts_defaults tests/i_selector
        tests/netsync_stops_on_key_id_clash
        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 database.cc database.hh
        diff_patch.cc diff_patch.hh lua-testsuite.lua merge.cc
        monotone.texi netsync.cc po/de.po po/es.po po/it.po po/sv.po
        refiner.cc roster_merge.cc roster_merge.hh
        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/selectors.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
Modified attrs:
        util/mtnopt

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
15be8e6d3d9a788a082c6305084d3381e4c40ff7)
            to branch 'net.venge.monotone.automate_show_conflict' (head 
c4c9fd954ede200a16696ffe5811756445041c05)


monotone --db={your.database} diff 
--revision=15be8e6d3d9a788a082c6305084d3381e4c40ff7 
--revision=6f166933d80a5d0dc86afb3d9c7e307d775ee21d
monotone --db={your.database} diff 
--revision=c4c9fd954ede200a16696ffe5811756445041c05 
--revision=6f166933d80a5d0dc86afb3d9c7e307d775ee21d
----------------------------------------------------------------------