[Monotone-commits-nodiffs] Revision fc349607d18f384b4b4d424b34d60bc99f417dbe

[monotone]

-----------------------------------------------------------------
Revision: fc349607d18f384b4b4d424b34d60bc99f417dbe
Ancestor: 2a8a527267594845ef05344f96f2873aa40c970f
Ancestor: 87fe6d9e2feee56edc43566fc4cfe54fc4f94bb2
Author: address@hidden
Date: 2008-08-24T21:33:16
Branch: net.venge.monotone.automate_show_conflict

Deleted entries:
        debian/monotone-server.examples
        tests/syntax_errors_in_.mtn-ignore/stderr-ref
        tests/syntax_errors_in_.mtn-ignore/stdout-ref
Added files:
        contrib/command/init.lua contrib/dump-test-logs.sh
        database_format.text debian/monotone-doc.doc-base
        debian/monotone-doc.postinst multi-mark-merge.text
        ss-existence-merge.text ss-mark-merge.text
        tests/automate_get_workspace_root/__driver__.lua
        tests/checkout_in_windows_root/__driver__.lua
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/exchanging_work_via_netsync_sent_notes/__driver__.lua
        tests/exchanging_work_via_netsync_sent_notes/testnotes.test
        tests/exchanging_work_via_netsync_sent_notes/testnotes2.test
        tests/resolve_duplicate_name_conflict/conflicts-resolved
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_1-beth_1
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_2-jim_1
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_2-jim_1-conflicts
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_3-beth_3
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-jim_1-beth_2
        tests/resolve_duplicate_name_conflict/expected-merged-revision-jim_1
        tests/resolve_duplicate_name_conflict/expected-update-messages-beth_3
        tests/resolve_duplicate_name_conflict/expected-update-messages-jim_1
        tests/resolve_duplicate_name_conflict/expected-update-messages-jim_2
        
tests/resolve_duplicate_name_conflict/merge-abe_2-jim_1-resolve_conflicts
        tests/resolve_duplicate_name_conflict/merge-beth_2-jim_1-conflicts
        tests/resolve_duplicate_name_conflict_drop_vs_suture/__driver__.lua
        
tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_a_b-conflicts-resolve
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-conflicts
        
tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-conflicts-resolve-1
        
tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-conflicts-resolve-2
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-message-1
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-message-2
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-message-3
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_g_d-message-1
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_g_d-message-2
        tests/resolve_duplicate_name_conflict_drop_vs_suture/update-message-1
        tests/resolve_duplicate_name_conflict_multiple_parents/__driver__.lua
        unique-mark-merge.text unix/tester-check-net.c
        win32/tester-check-net.c
Added directories:
        tests/automate_get_workspace_root
        tests/checkout_in_windows_root tests/default_command_options
        tests/exchanging_work_via_netsync_sent_notes
        tests/resolve_duplicate_name_conflict_drop_vs_suture
        tests/resolve_duplicate_name_conflict_multiple_parents
Modified files:
        Makefile.am NEWS automate.cc basic_io.cc basic_io.hh
        cmd_files.cc cmd_merging.cc cmd_netsync.cc
        contrib/monotone-inotify.lua cset.cc cset.hh database.cc
        debian/changelog debian/control debian/copyright
        debian/monotone-doc.dirs debian/monotone-doc.docs
        debian/monotone-server.dirs debian/monotone-server.postinst
        debian/rules diff_patch.cc diff_patch.hh
        examples/display_branches.lua hybrid_map.hh
        lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        luaext_parse_basic_io.cc merge.cc merge.hh monotone.cc
        monotone.texi netsync.cc options_list.hh parallel_iter.hh
        po/de.po po/es.po po/it.po po/sv.po rev_types.hh revision.cc
        revision.hh roster.cc roster.hh roster_delta.cc
        roster_merge.cc roster_merge.hh std_hooks.lua testlib.lua
        tests/(imp)_merge((patch_foo_a),_(delete_foo_))/__driver__.lua
        tests/automate_identify/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/automate_inventory_restricted/__driver__.lua
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua
        tests/common/test_utils_inventory.lua
        tests/db_data_format_checking/__driver__.lua
        tests/merge((drop_a),_(rename_a_b,_patch_b))/__driver__.lua
        tests/merge((patch_a),_(drop_a))/__driver__.lua
        tests/merge((patch_a),_(drop_a,_add_a))/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        tests/netsync_hook_errcodes/__driver__.lua
        tests/netsync_permissions/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/pid_file_and_log_handles_open_failures/__driver__.lua
        tests/resolve_duplicate_name_conflict/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/mtn-ignore
        tests/two_parent_workspace_list/__driver__.lua
        tests/update_with_pending_modification/__driver__.lua
        util/mtnopt win32/fs.cc work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
2a8a527267594845ef05344f96f2873aa40c970f)
            to branch 'net.venge.monotone.automate_show_conflict' (head 
87fe6d9e2feee56edc43566fc4cfe54fc4f94bb2)


monotone --db={your.database} diff 
--revision=2a8a527267594845ef05344f96f2873aa40c970f 
--revision=fc349607d18f384b4b4d424b34d60bc99f417dbe
monotone --db={your.database} diff 
--revision=87fe6d9e2feee56edc43566fc4cfe54fc4f94bb2 
--revision=fc349607d18f384b4b4d424b34d60bc99f417dbe
----------------------------------------------------------------------