[Monotone-commits-diffs] Revision aeca651b8fd8db5004a5fdbdfe49d2c536997c89

[monotone]

-----------------------------------------------------------------
Revision: aeca651b8fd8db5004a5fdbdfe49d2c536997c89
Ancestor: a6d8b6a4b6c95782b1e721b5652cd60d0d56df3b
Ancestor: c21eefc002b8f9c430e9f4cc16c4af7b852f54ec
Author: address@hidden
Date: 2007-11-01T18:09:00
Branch: net.venge.monotone.debian-diff
Tag: monotone-0.37-1

Deleted entries:
        contrib/usher.cc tests/db_kill_rev_locally_command_2
        tests/db_kill_rev_locally_command_2/__driver__.lua views.sql
Renamed entries:
        sqlite/limits.h to sqlite/sqliteLimit.h
        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:
        contrib/README.missing contrib/extra-commands.lua
        contrib/monotone-mail-notify.lua
        contrib/monotone-mail-notify.sh m4/pcre.m4 m4/pkg.m4
        pcre/README pcre/pcre.h pcre/pcre_chartables.c
        pcre/pcre_compile.c pcre/pcre_config.c pcre/pcre_config.h
        pcre/pcre_dfa_exec.c pcre/pcre_exec.c pcre/pcre_fullinfo.c
        pcre/pcre_get.c pcre/pcre_globals.c pcre/pcre_info.c
        pcre/pcre_internal.h pcre/pcre_maketables.c
        pcre/pcre_newline.c pcre/pcre_ord2utf8.c
        pcre/pcre_refcount.c pcre/pcre_study.c pcre/pcre_tables.c
        pcre/pcre_try_flipped.c pcre/pcre_ucp_searchfuncs.c
        pcre/pcre_valid_utf8.c pcre/pcre_version.c
        pcre/pcre_xclass.c pcre/pcrepattern.texi
        pcre/pcresyntax.texi pcre/ucp.h pcre/ucpinternal.h
        pcre/ucptable.h pcrewrap.cc pcrewrap.hh 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/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/syntax_errors_in_.mtn-ignore/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/mtn-ignore
        tests/syntax_errors_in_.mtn-ignore/stderr-ref
        tests/syntax_errors_in_.mtn-ignore/stdout-ref
        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:
        pcre tests/alias_command tests/automate_inventory_restricted
        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/syntax_errors_in_.mtn-ignore
        tests/user_commands
Modified files:
        .mtn-ignore AUTHORS INSTALL Makefile.am NEWS UPGRADE
        app_state.cc app_state.hh asciik.hh automate.cc base.hh
        basic_io.hh cert.cc cert.hh charset.cc charset.hh 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_ws_commit.cc commands.cc commands.hh configure.ac
        constants.cc constants.hh contrib/Monotone.pm contrib/README
        contrib/monotone.bash_completion cset.hh cycle_detector.hh
        database.cc database.hh debian/NEWS debian/changelog
        debian/control debian/copyright diff_patch.cc diff_patch.hh
        enumerator.cc enumerator.hh globish.cc globish.hh graph.hh
        inodeprint.hh key_store.cc 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 luaext_globish.cc m4/boost.m4
        m4/numeric_vocab.m4 mac/readme-mac.txt 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 notes/testsuite.txt option.hh
        options_list.hh packet.cc paths.cc paths.hh pch.hh
        po/POTFILES.in 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.cc 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/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/db_kill_rev_locally/__driver__.lua
        tests/db_kill_rev_locally_and_recommit/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/importing_files_with_non-english_names/__driver__.lua
        tests/invoke_toplevel_group/__driver__.lua
        tests/log_quits_on_SIGPIPE/hookfile
        tests/rename_file_to_dir/__driver__.lua
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/test_a_merge_8/__driver__.lua
        tests/test_annotate_command/__driver__.lua
        tests/things_in_.mtn-ignore_get_ignored/__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/main.cc unix/process.cc
        update.cc uri.cc uri.hh visualc/config.h
        visualc/monotone.vcproj visualc/unit_tests.vcproj vocab.cc
        vocab_terms.hh win32/main.cc win32/monotone.iss
        win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
        work.cc work.hh xdelta.cc

ChangeLog: 

explicit merge of 'c21eefc002b8f9c430e9f4cc16c4af7b852f54ec'
              and 'a6d8b6a4b6c95782b1e721b5652cd60d0d56df3b'


monotone --db={your.database} diff 
--revision=a6d8b6a4b6c95782b1e721b5652cd60d0d56df3b 
--revision=aeca651b8fd8db5004a5fdbdfe49d2c536997c89
monotone --db={your.database} diff 
--revision=c21eefc002b8f9c430e9f4cc16c4af7b852f54ec 
--revision=aeca651b8fd8db5004a5fdbdfe49d2c536997c89
----------------------------------------------------------------------