[Monotone-commits-diffs] Revision ef32720348504946f99e17d50dceb2c95f7c4750

[monotone]

-----------------------------------------------------------------
Revision: ef32720348504946f99e17d50dceb2c95f7c4750
Ancestor: 133d7c3ff21229143d27ccd7cca5d64d2b117335
Ancestor: c1aee91e95114022f430d0884efbb21d0edd60b0
Author: Timothy Brownawell  <address@hidden>
Date: 2007-09-26T01:28:03
Branch: net.venge.monotone.netsync.refactor

Deleted entries:
        contrib/monotone-import.pl contrib/usher.cc
        m4/ax_create_stdint_h.m4 tests/db_kill_rev_locally_command_2
        tests/db_kill_rev_locally_command_2/__driver__.lua
Renamed entries:
        tests/automate_inventory/inventory_hooks.lua to 
tests/inventory_hooks.lua
        tests/db_kill_rev_and_recommit to tests/db_kill_rev_locally_and_recommit
        tests/db_kill_rev_locally_command to tests/db_kill_rev_locally
        testsuite.lua to lua-testsuite.lua
Added files:
        audit-includes base.hh contrib/Monotone.pm
        contrib/README.missing contrib/extra-commands.lua
        contrib/monotone-buildbot-notification.lua
        contrib/monotone-cluster-push.lua
        contrib/monotone-mail-notify-standalone.lua
        contrib/mtn_makepermissions debian/monotone.manpages
        debian/mtn.1 debian/po/nl.po m4/numeric_vocab.m4 network.cc
        network.hh sqlite/btreeInt.h sqlite/malloc.c
        sqlite/sqliteLimit.h sqlite/vdbeblob.c tester-plaf.hh
        tests/alias_command/__driver__.lua
        tests/alias_command/extra_rc
        tests/automate_inventory_restricted/__driver__.lua
        tests/common/test_utils_inventory.lua
        tests/db_kill_rev_locally_workspace/__driver__.lua
        tests/keydir_defaults_to_under_confdir/__driver__.lua
        tests/netsync_key_hook/__driver__.lua
        tests/netsync_key_hook/client-hooks.lua
        tests/netsync_key_hook/read-permissions
        tests/netsync_with_suspended_branch/__driver__.lua
        tests/pluck_directory_bug_1/__driver__.lua
        tests/pluck_directory_bug_2/__driver__.lua
        tests/restricted_diff_bug/__driver__.lua
        tests/restricted_revert_bug/__driver__.lua
        tests/server_initiated_sync/__driver__.lua
        tests/server_initiated_sync/server1.rc
        tests/suspend/__driver__.lua
        tests/test_a_merge_9/__driver__.lua
        tests/test_a_merge_9/left tests/test_a_merge_9/parent
        tests/test_a_merge_9/right
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc unit-testsuite.lua
        unix/tester-plaf.cc vector.hh visualc/runtests.bat
        visualc/unit_tests.vcproj win32/tester-plaf.cc
Added directories:
        tests/alias_command tests/automate_inventory_restricted
        tests/db_kill_rev_locally_workspace
        tests/keydir_defaults_to_under_confdir
        tests/netsync_key_hook tests/netsync_with_suspended_branch
        tests/pluck_directory_bug_1 tests/pluck_directory_bug_2
        tests/restricted_diff_bug tests/restricted_revert_bug
        tests/server_initiated_sync tests/suspend
        tests/test_a_merge_9 tests/user_commands
Modified files:
        AUTHORS HACKING INSTALL Makefile.am NEWS UPGRADE adler32.hh
        annotate.cc app_state.cc app_state.hh asciik.cc asciik.hh
        automate.cc basic_io.cc basic_io.hh botan/mem_pool.cpp
        botan/mem_pool.h cert.cc cert.hh charset.cc cmd.hh
        cmd_automate.cc cmd_db.cc cmd_diff_log.cc cmd_files.cc
        cmd_key_cert.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
        cmd_othervcs.cc cmd_packet.cc cmd_ws_commit.cc commands.cc
        commands.hh configure.ac constants.cc constants.hh
        contrib/README contrib/ext_hooks_expand.pl
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        crypto_tests.cc cset.cc cset.hh current_exception.hh
        cycle_detector.hh database.cc database.hh database_check.cc
        dates.cc dates.hh debian/changelog debian/control
        debian/monotone-server.postinst
        debian/monotone-server.postrm debian/rules debian/watch
        diff_patch.cc diff_patch.hh enumerator.cc enumerator.hh
        epoch.cc epoch.hh file_io.cc file_io.hh globish.cc
        globish.hh graph.cc graph.hh hash_map.hh hmac.cc hmac.hh
        idna/idn-int.h inodeprint.cc inodeprint.hh interner.hh
        key_store.cc key_store.hh keys.cc keys.hh lcs.cc lcs.hh
        legacy.cc legacy.hh lua/lcode.cc lua/ldebug.cc
        lua/lparser.cc lua/ltable.cc lua/lvm.cc lua-testsuite.lua
        lua.cc lua.hh lua_hooks.cc lua_hooks.hh luaext_globish.cc
        luaext_guess_binary.cc luaext_mkstemp.cc
        luaext_parse_basic_io.cc luaext_platform.cc m4/boost.m4
        m4/sqlite.m4 merge.cc merkle_tree.cc merkle_tree.hh
        mkstemp.cc mkstemp.hh monotone.cc monotone.spec
        monotone.texi mt_version.cc mt_version.hh mtn-sanity.cc
        netcmd.cc netcmd.hh netsync.cc netxx_pipe.cc netxx_pipe.hh
        notes/README.testing notes/testsuite.txt numeric_vocab.cc
        numeric_vocab.hh option.cc option.hh options.cc
        options_list.hh outdated_indicator.cc packet.cc packet.hh
        parallel_iter.hh paths.cc paths.hh platform.hh po/de.po
        po/es.po po/fr.po po/it.po po/ja.po po/pt_BR.po po/sv.po
        project.cc project.hh randomfile.hh randomizer.cc
        rcs_file.cc rcs_file.hh rcs_import.cc refiner.cc refiner.hh
        restrictions.cc restrictions.hh rev_height.cc rev_height.hh
        revision.cc revision.hh roster.cc roster.hh roster_delta.cc
        roster_merge.cc roster_merge.hh sanity.cc sanity.hh
        schema_migration.cc schema_migration.hh selectors.cc
        selectors.hh sha1.cc sha1_engine.hh simplestring_xform.cc
        simplestring_xform.hh smap.hh specialized_lexical_cast.cc
        sqlite/alter.c sqlite/analyze.c sqlite/attach.c
        sqlite/auth.c sqlite/btree.c sqlite/btree.h sqlite/build.c
        sqlite/callback.c sqlite/date.c sqlite/expr.c sqlite/func.c
        sqlite/insert.c sqlite/keywordhash.h sqlite/legacy.c
        sqlite/loadext.c sqlite/main.c sqlite/opcodes.c
        sqlite/opcodes.h sqlite/os.c sqlite/os.h sqlite/os_common.h
        sqlite/os_os2.c sqlite/os_unix.c sqlite/os_win.c
        sqlite/pager.c sqlite/pager.h sqlite/parse.c sqlite/pragma.c
        sqlite/prepare.c sqlite/printf.c sqlite/select.c
        sqlite/sqlite3.h sqlite/sqlite3ext.h sqlite/sqliteInt.h
        sqlite/table.c sqlite/tokenize.c sqlite/trigger.c
        sqlite/update.c sqlite/utf.c sqlite/util.c sqlite/vdbe.c
        sqlite/vdbe.h sqlite/vdbeInt.h sqlite/vdbeapi.c
        sqlite/vdbeaux.c sqlite/vdbemem.c sqlite/vtab.c
        sqlite/where.c ssh_agent.cc ssh_agent.hh std_hooks.lua
        string_queue.cc string_queue.hh
        tester-tests/cleanup-1/__driver__.lua
        tester-tests/cleanup-2/__driver__.lua
        tester-tests/isolated-1/__driver__.lua tester-testsuite.lua
        tester.cc testlib.lua
        tests/annotate_accidental_clean_merge/__driver__.lua
        tests/annotate_file_whose_name_changed/__driver__.lua
        tests/annotate_where_line_splits/__driver__.lua
        tests/annotate_where_lineage_depends_on_traversal/__driver__.lua
        tests/annotate_where_one_parent_is_full_copy/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/common/netsync.lua
        tests/db_kill_rev_locally/__driver__.lua
        tests/db_kill_rev_locally_and_recommit/__driver__.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/invalid_--root_settings/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/netsync_permissions_wildcards/__driver__.lua
        tests/rename_file_to_dir/__driver__.lua
        
tests/schema_migration/7ca81b45279403419581d7fde31ed888a80bd34e.mtn.dumped
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/test_a_merge_8/__driver__.lua
        tests/test_annotate_command/__driver__.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua
        transforms.cc txt2c.cc ui.cc ui.hh unit_tests.cc
        unit_tests.hh unix/cputime.cc unix/fs.cc
        unix/get_system_flavour.cc unix/inodeprint.cc unix/main.cc
        unix/os_strerror.cc unix/process.cc unix/read_password.cc
        unix/ssh_agent_platform.cc unix/terminal.cc update.cc uri.cc
        uri.hh visualc/botan.vcproj visualc/config.h
        visualc/lua.vcproj visualc/monotone.sln
        visualc/monotone.vcproj visualc/netxx.vcproj
        visualc/sqlite3.vcproj visualc/tester.vcproj
        visualc/txt2c.vcproj vocab.cc vocab.hh vocab_terms.hh
        win32/cputime.cc win32/fs.cc win32/get_system_flavour.cc
        win32/inodeprint.cc win32/main.cc win32/make_io_binary.cc
        win32/monotone.iss win32/os_strerror.cc win32/process.cc
        win32/read_password.cc win32/ssh_agent_platform.cc
        win32/ssh_agent_platform.hh win32/terminal.cc work.cc
        work.hh work_migration.cc xdelta.cc xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
133d7c3ff21229143d27ccd7cca5d64d2b117335)
            to branch 'net.venge.monotone.netsync.refactor' (head 
c1aee91e95114022f430d0884efbb21d0edd60b0)


monotone --db={your.database} diff 
--revision=133d7c3ff21229143d27ccd7cca5d64d2b117335 
--revision=ef32720348504946f99e17d50dceb2c95f7c4750
monotone --db={your.database} diff 
--revision=c1aee91e95114022f430d0884efbb21d0edd60b0 
--revision=ef32720348504946f99e17d50dceb2c95f7c4750
----------------------------------------------------------------------