[Monotone-commits-diffs] Revision 6f527f7f4b83260e447e485c8bd4cb45d8aa1b91

[monotone]

-----------------------------------------------------------------
Revision: 6f527f7f4b83260e447e485c8bd4cb45d8aa1b91
Ancestor: 3199a0c8d7f6bc0deb4b750bfcfdbbc14718b45a
Ancestor: b07e110b3a75925a13206e6d4c2bf90dbaf718d0
Author: address@hidden
Date: 2007-05-24T11:53:04
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Renamed entries:
        tests/automate_attributes to tests/automate_get_attributes
Added files:
        contrib/lua-mode.el tests/automate_roots/__driver__.lua
        tests/automate_set_drop_attribute/__driver__.lua
        tests/diff_restriction_renamed_parent/__driver__.lua
        tests/invoke_subcommands/__driver__.lua
        tests/invoke_toplevel_group/__driver__.lua
        tests/key_files_created_securely/__driver__.lua
        tests/test_the_version_command/__driver__.lua
        win32/monotone.bmp
Added directories:
        tests/automate_roots tests/automate_set_drop_attribute
        tests/diff_restriction_renamed_parent
        tests/invoke_subcommands tests/invoke_toplevel_group
        tests/key_files_created_securely
        tests/test_the_version_command
Modified files:
        Makefile.am NEWS ROADMAP UPGRADE app_state.cc asciik.cc
        automate.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 contrib/monotone.zsh_completion database.cc
        database.hh debian/changelog diff_patch.cc diff_patch.hh
        file_io.cc file_io.hh key_store.cc keys.cc keys.hh
        lua_hooks.cc lua_hooks.hh luaext_platform.cc monotone.cc
        monotone.spec monotone.texi mt_version.cc numeric_vocab.hh
        option.cc option.hh options_list.hh platform.hh
        po/POTFILES.in po/README po/de.po po/es.po po/fr.po po/it.po
        po/pt_BR.po po/sv.po rcs_import.cc revision.cc revision.hh
        sanity.cc selectors.cc sha1.cc simplestring_xform.cc
        simplestring_xform.hh sqlite/btree.c sqlite/expr.c
        sqlite/legacy.c sqlite/loadext.c sqlite/prepare.c
        sqlite/sqlite3.h sqlite/vdbe.c sqlite/vtab.c sqlite/where.c
        tests/automate_get_attributes/__driver__.lua
        tests/check_that_--xargs_and_-(at)_behave_correctly/__driver__.lua
        tests/command_completion/__driver__.lua
        tests/common/netsync.lua
        tests/empty_environment/__driver__.lua
        tests/netsync,--set-default/__driver__.lua
        tests/netsync_verifies_server_keys/__driver__.lua
        tests/schema_migration_error_recovery/__driver__.lua
        tests/test_the_help_command/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/usage_output_streams/__driver__.lua ui.cc ui.hh
        unix/fs.cc unix/process.cc visualc/config.h win32/fs.cc
        win32/monotone.iss work.cc
Modified attrs:
        win32/monotone.bmp

ChangeLog: 

merge of '3199a0c8d7f6bc0deb4b750bfcfdbbc14718b45a'
     and 'b07e110b3a75925a13206e6d4c2bf90dbaf718d0'


monotone --db={your.database} diff 
--revision=3199a0c8d7f6bc0deb4b750bfcfdbbc14718b45a 
--revision=6f527f7f4b83260e447e485c8bd4cb45d8aa1b91
monotone --db={your.database} diff 
--revision=b07e110b3a75925a13206e6d4c2bf90dbaf718d0 
--revision=6f527f7f4b83260e447e485c8bd4cb45d8aa1b91
----------------------------------------------------------------------