[Monotone-commits-diffs] Revision 8a3b812702e2b3668fcd2ddee1f2d2c79b9bbe47

[monotone]

-----------------------------------------------------------------
Revision: 8a3b812702e2b3668fcd2ddee1f2d2c79b9bbe47
Ancestor: 1afc6a606400971f88ec9d508fcfc9d92b1b32f0
Ancestor: 597b977765c52d8c6882f48e4302f395659b1260
Author: address@hidden
Date: 2007-09-17T10:03:43
Branch: net.venge.monotone.basic_io.inventory

Deleted entries:
        contrib/usher.cc tests/db_kill_rev_locally_command_2
        tests/db_kill_rev_locally_command_2/__driver__.lua
Renamed entries:
        sqlite/limits.h to sqlite/sqliteLimit.h
        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:
        contrib/Monotone.pm contrib/README.missing
        contrib/diff3_keep_conflicts_merger.lua
        contrib/extra-commands.lua
        contrib/monotone-mail-notify-standalone.lua tester-plaf.hh
        tests/alias_command/__driver__.lua
        tests/alias_command/extra_rc
        tests/db_kill_rev_locally_workspace/__driver__.lua
        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/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 win32/tester-plaf.cc
Added directories:
        tests/alias_command tests/db_kill_rev_locally_workspace
        tests/netsync_with_suspended_branch
        tests/pluck_directory_bug_1 tests/pluck_directory_bug_2
        tests/restricted_diff_bug tests/restricted_revert_bug
        tests/suspend tests/test_a_merge_9 tests/user_commands
Modified files:
        INSTALL Makefile.am NEWS UPGRADE app_state.cc app_state.hh
        asciik.hh automate.cc basic_io.hh cert.cc cert.hh charset.cc
        cmd.hh cmd_automate.cc cmd_db.cc cmd_diff_log.cc
        cmd_key_cert.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
        cmd_ws_commit.cc commands.cc commands.hh configure.ac
        contrib/README contrib/ext_hooks_expand.pl
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        cset.hh cycle_detector.hh database.cc database.hh
        debian/changelog debian/control
        debian/monotone-server.postinst
        debian/monotone-server.postrm diff_patch.cc diff_patch.hh
        enumerator.cc enumerator.hh graph.hh key_store.hh lcs.cc
        lcs.hh lua/lcode.cc lua/ldebug.cc lua/lparser.cc
        lua/ltable.cc lua/lvm.cc lua-testsuite.lua lua.cc
        lua_hooks.cc lua_hooks.hh m4/numeric_vocab.m4 merkle_tree.hh
        monotone.cc monotone.spec monotone.texi mtn-sanity.cc
        netcmd.cc netcmd.hh netsync.cc netxx_pipe.cc netxx_pipe.hh
        notes/README.testing option.hh options_list.hh paths.cc
        paths.hh po/de.po po/es.po po/it.po po/sv.po project.cc
        project.hh randomfile.hh rcs_file.cc rcs_file.hh
        rcs_import.cc restrictions.cc revision.cc revision.hh
        roster.cc sanity.cc sanity.hh selectors.hh
        simplestring_xform.cc simplestring_xform.hh smap.hh
        sqlite/alter.c sqlite/analyze.c sqlite/btree.c
        sqlite/build.c sqlite/expr.c sqlite/func.c sqlite/insert.c
        sqlite/keywordhash.h sqlite/loadext.c sqlite/main.c
        sqlite/malloc.c sqlite/opcodes.c sqlite/opcodes.h
        sqlite/os.h sqlite/os_common.h sqlite/os_os2.c
        sqlite/os_unix.c sqlite/pager.c 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/sqliteLimit.h sqlite/tokenize.c
        sqlite/trigger.c sqlite/update.c sqlite/utf.c sqlite/util.c
        sqlite/vdbe.c sqlite/vdbeInt.h sqlite/vdbeapi.c
        sqlite/vdbeaux.c sqlite/vdbeblob.c sqlite/vdbemem.c
        sqlite/vtab.c sqlite/where.c ssh_agent.hh std_hooks.lua
        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/checkout_validates_target_directory/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/db_kill_rev_locally/__driver__.lua
        tests/db_kill_rev_locally_and_recommit/__driver__.lua
        tests/invalid_--root_settings/__driver__.lua
        tests/rename_file_to_dir/__driver__.lua
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/test_a_merge_8/__driver__.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua
        transforms.cc ui.cc ui.hh unit_tests.cc unit_tests.hh
        unix/get_system_flavour.cc unix/process.cc update.cc
        visualc/config.h win32/monotone.iss work.cc work.hh
        xdelta.cc

ChangeLog: 

merge of '1afc6a606400971f88ec9d508fcfc9d92b1b32f0'
     and '597b977765c52d8c6882f48e4302f395659b1260'


monotone --db={your.database} diff 
--revision=1afc6a606400971f88ec9d508fcfc9d92b1b32f0 
--revision=8a3b812702e2b3668fcd2ddee1f2d2c79b9bbe47
monotone --db={your.database} diff 
--revision=597b977765c52d8c6882f48e4302f395659b1260 
--revision=8a3b812702e2b3668fcd2ddee1f2d2c79b9bbe47
----------------------------------------------------------------------