[Monotone-commits-diffs] Revision 8e853da7dbe3f125f0bb8b1248c7f481c61b77c2

[monotone]

-----------------------------------------------------------------
Revision: 8e853da7dbe3f125f0bb8b1248c7f481c61b77c2
Ancestor: 1cd5ea74ea44594edcee0266979d06c5e5ab21b7
Ancestor: 5175e54fc48cce9f7d68cc72fdc6ccd2f8a4aa0f
Author: address@hidden
Date: 2008-07-08T17:38:03
Branch: net.venge.monotone

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_workspace_root/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stdout
        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
        unix/tester-check-net.c win32/tester-check-net.c
Added directories:
        tests/automate_get_workspace_root
        tests/checkout_in_windows_root
        tests/exchanging_work_via_netsync_sent_notes
Modified files:
        HACKING Makefile.am NEWS asciik.cc automate.cc basic_io.cc
        basic_io.hh 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 examples/display_branches.lua
        lru_writeback_cache.hh lua-testsuite.lua lua_hooks.cc
        lua_hooks.hh luaext_parse_basic_io.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 std_hooks.lua
        tester.cc testlib.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_restricted/__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/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua
        tests/db_data_format_checking/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
        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/stdout-ref
        tests/two_parent_workspace_list/__driver__.lua
        tests/util_mtnopt/__driver__.lua util/mtnopt win32/fs.cc
        work.cc

ChangeLog: 

merge of '1cd5ea74ea44594edcee0266979d06c5e5ab21b7'
     and '5175e54fc48cce9f7d68cc72fdc6ccd2f8a4aa0f'


monotone --db={your.database} diff 
--revision=1cd5ea74ea44594edcee0266979d06c5e5ab21b7 
--revision=8e853da7dbe3f125f0bb8b1248c7f481c61b77c2
monotone --db={your.database} diff 
--revision=5175e54fc48cce9f7d68cc72fdc6ccd2f8a4aa0f 
--revision=8e853da7dbe3f125f0bb8b1248c7f481c61b77c2
----------------------------------------------------------------------