[Monotone-commits-diffs] Revision a114a33fa035a709749a7e4b53787c895d702caa

[monotone]

-----------------------------------------------------------------
Revision: a114a33fa035a709749a7e4b53787c895d702caa
Ancestor: af0ac243340ee1819af56f8a33968680a39bcfd5
Ancestor: d85690704170f96a5657f3ec2fa77917f7ebe195
Author: address@hidden
Date: 2008-07-15T06:21:36
Branch: net.venge.monotone.threaded

Deleted entries:
        debian/monotone-server.examples
Added files:
        contrib/command/init.lua contrib/dump-test-logs.sh
        debian/monotone-doc.doc-base debian/monotone-doc.postinst
        tests/automate_get_options/__driver__.lua
        tests/automate_get_workspace_root/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stdout
        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/checkout_in_windows_root/__driver__.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/merge_with_conflicting_name_and_renamed_dir/expected.stdout
        tests/resolve_duplicate_name_conflict/__driver__.lua
        threads.hh unix/tester-check-net.c unix/threads.cc
        win32/tester-check-net.c
Added directories:
        tests/automate_get_options tests/automate_get_workspace_root
        tests/automate_show_conflicts
        tests/automate_show_conflicts_defaults
        tests/checkout_in_windows_root
        tests/exchanging_work_via_netsync_sent_notes
        tests/resolve_duplicate_name_conflict
Modified files:
        HACKING Makefile.am NEWS asciik.cc automate.cc base.hh
        basic_io.cc basic_io.hh cmd_automate.cc cmd_files.cc
        cmd_merging.cc contrib/monotone-inotify.lua
        contrib/monotone.bash_completion 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 file_io.cc file_io.hh
        lru_writeback_cache.hh lua-testsuite.lua lua_hooks.cc
        lua_hooks.hh luaext_parse_basic_io.cc merge.cc monotone.texi
        netsync.cc options_list.hh paths.cc po/de.po po/es.po
        po/it.po po/sv.po roster.cc roster_merge.cc roster_merge.hh
        std_hooks.lua tester.cc testlib.lua
        tests/automate_cert/__driver__.lua
        tests/automate_heads/__driver__.lua
        tests/automate_identify/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/automate_inventory_ignore_dirs/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/local_hooks.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/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua
        tests/common/test_utils_inventory.lua
        tests/conflict_messages/__driver__.lua
        tests/db_data_format_checking/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/pid_file_and_log_handles_open_failures/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/stdout-ref
        tests/two_parent_workspace_list/__driver__.lua
        tests/util_mtnopt/__driver__.lua util/mtnopt win32/fs.cc
        work.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
af0ac243340ee1819af56f8a33968680a39bcfd5)
            to branch 'net.venge.monotone.threaded' (head 
d85690704170f96a5657f3ec2fa77917f7ebe195)


monotone --db={your.database} diff 
--revision=af0ac243340ee1819af56f8a33968680a39bcfd5 
--revision=a114a33fa035a709749a7e4b53787c895d702caa
monotone --db={your.database} diff 
--revision=d85690704170f96a5657f3ec2fa77917f7ebe195 
--revision=a114a33fa035a709749a7e4b53787c895d702caa
----------------------------------------------------------------------