[Monotone-commits-diffs] Revision f62b989aee18ebc004790a4e488d5d0692899465

[monotone]

-----------------------------------------------------------------
Revision: f62b989aee18ebc004790a4e488d5d0692899465
Ancestor: 36b6cb016019e675bc24a2fa97d4eb19fa4919af
Ancestor: f38760ae1798c8b2b88910d9c2bf9cc4bceb5357
Author: address@hidden
Date: 2008-03-30T20:51:39
Branch: net.venge.monotone.automate_show_conflict

Added files:
        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_options/__driver__.lua
        tests/automate_show_conflicts_options/expected-1.stdout
        tests/automate_show_conflicts_options/expected-2.stdout
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        tests/resolve_duplicate_name_conflict/__driver__.lua
Added directories:
        tests/automate_show_conflicts
        tests/automate_show_conflicts_options
        tests/merge_with_conflicting_name_and_renamed_dir
        tests/resolve_duplicate_name_conflict
Modified files:
        NEWS automate.cc cmd_automate.cc cmd_merging.cc
        cmd_netsync.cc database.cc diff_patch.cc diff_patch.hh
        enumerator.cc globish.cc lua-testsuite.lua lua_hooks.cc
        lua_hooks.hh merge.cc monotone.texi po/de.po po/es.po
        po/sv.po restrictions.cc roster_merge.cc roster_merge.hh
        sanity.cc sanity.hh selectors.cc std_hooks.lua
        tests/conflict_messages/__driver__.lua
        tests/netsync_mtn_uri_scheme/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
36b6cb016019e675bc24a2fa97d4eb19fa4919af)
            to branch 'net.venge.monotone.automate_show_conflict' (head 
f38760ae1798c8b2b88910d9c2bf9cc4bceb5357)


monotone --db={your.database} diff 
--revision=36b6cb016019e675bc24a2fa97d4eb19fa4919af 
--revision=f62b989aee18ebc004790a4e488d5d0692899465
monotone --db={your.database} diff 
--revision=f38760ae1798c8b2b88910d9c2bf9cc4bceb5357 
--revision=f62b989aee18ebc004790a4e488d5d0692899465
----------------------------------------------------------------------