[Monotone-commits-diffs] Revision 70dc0d69ef2dbaf6fe126edf4085b402fec63490

[monotone]

-----------------------------------------------------------------
Revision: 70dc0d69ef2dbaf6fe126edf4085b402fec63490
Ancestor: 2af63657ecd38ac83f19064cce56a173d49ae0d8
Ancestor: 9acafa3a1956844e140f65a666edf1986650b9d9
Author: address@hidden
Date: 2010-05-19 06.44.03
Branch: net.venge.monotone.bugfest-2010.20447-dscherger

Added files:
        tests/automate_update/__driver__.lua
        tests/change_workspace/__driver__.lua
        tests/change_workspace/test_hooks.lua
        tests/diff_patch_add/__driver__.lua
        tests/diff_patch_drop/__driver__.lua
        tests/diff_patch_rename/__driver__.lua
        tests/keep_valid_workspace_options_on_error/__driver__.lua
        tests/log_recognizes_invalid_workspace_parent/__driver__.lua
        tests/netsync_per_server_defaults/__driver__.lua
        tests/setup_creates_internal_db/__driver__.lua
        tests/unchanged_options_preserves_mtime/__driver__.lua
Added directories:
        tests/automate_update tests/change_workspace
        tests/diff_patch_add tests/diff_patch_drop
        tests/diff_patch_rename
        tests/keep_valid_workspace_options_on_error
        tests/log_recognizes_invalid_workspace_parent
        tests/netsync_per_server_defaults
        tests/setup_creates_internal_db
        tests/unchanged_options_preserves_mtime
Modified files:
        INSTALL NEWS cmd_automate.cc cmd_diff_log.cc cmd_list.cc
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc
        contrib/Monotone.pm file_io.hh key_store.cc merge_content.cc
        merge_content.hh monotone.cc monotone.texi
        network/automate_session.cc network/reactor.cc
        options_list.hh packet.cc paths.hh po/de.po po/es.po
        po/fr.po po/it.po po/ja.po po/pt.po po/pt_BR.po po/sv.po
        selectors.cc simplestring_xform.cc std_hooks.lua
        tests/common/netsync-hooks.lua
        tests/db_kill_tag_locally/__driver__.lua
        tests/diff_restriction_renamed_parent/__driver__.lua
        tests/diff_shows_renames/__driver__.lua
        tests/diffing_a_revision_with_an_added_file/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/importing_cvs_tricky_repo_with_tags/test.tags
        tests/log_--diffs/__driver__.lua
        tests/log_--diffs/expect_full
        tests/log_--diffs/expect_restrict
        tests/ls_tags_with_ambiguous_tags/__driver__.lua
        tests/move_conflicting_unversioned/__driver__.lua
        tests/netsync_default_server_pattern/__driver__.lua
        tests/netsync_over_pipes/__driver__.lua
        tests/restricted_diff_bug/__driver__.lua
        tests/serve-automate/__driver__.lua
        tests/serve-automate-single-run/__driver__.lua
        tests/tags_and_tagging_of_revisions/__driver__.lua
        win32/main.cc work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
9acafa3a1956844e140f65a666edf1986650b9d9)
            to branch 'net.venge.monotone.bugfest-2010.20447-dscherger' (head 
2af63657ecd38ac83f19064cce56a173d49ae0d8)


monotone --db={your.database} diff 
--revision=2af63657ecd38ac83f19064cce56a173d49ae0d8 
--revision=70dc0d69ef2dbaf6fe126edf4085b402fec63490
monotone --db={your.database} diff 
--revision=9acafa3a1956844e140f65a666edf1986650b9d9 
--revision=70dc0d69ef2dbaf6fe126edf4085b402fec63490
----------------------------------------------------------------------