[Monotone-commits-diffs] Revision 60dc2c8093b5c24a829066951af1b5910f68a34a

[monotone]

-----------------------------------------------------------------
Revision: 60dc2c8093b5c24a829066951af1b5910f68a34a
Ancestor: b4787bd05558f1af4cd305637bc018dcee042b2e
Ancestor: f3f6c00481e5271341f955bccb1cfc3b274f7599
Author: address@hidden
Date: 2007-06-28T21:49:43
Branch: net.venge.monotone.basic_io.inventory

Added files:
        contrib/lua-mode.el tests/invoke_subcommands/__driver__.lua
        tests/invoke_toplevel_group/__driver__.lua
        tests/test_the_version_command/__driver__.lua
        win32/monotone.bmp
Added directories:
        tests/invoke_subcommands tests/invoke_toplevel_group
        tests/test_the_version_command
Modified files:
        Makefile.am NEWS ROADMAP 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 constants.cc
        database.cc database.hh diff_patch.cc diff_patch.hh
        lua_hooks.cc lua_hooks.hh luaext_platform.cc monotone.cc
        monotone.texi mt_version.cc numeric_vocab.hh option.cc
        option.hh options_list.hh platform.hh po/README po/de.po
        po/es.po po/fr.po po/sv.po revision.cc revision.hh sanity.cc
        selectors.cc sha1.cc simplestring_xform.cc
        simplestring_xform.hh
        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/usage_output_streams/__driver__.lua ui.cc ui.hh
        unix/fs.cc win32/fs.cc win32/monotone.iss work.cc
Modified attrs:
        win32/monotone.bmp

ChangeLog: 

merge of 'b4787bd05558f1af4cd305637bc018dcee042b2e'
     and 'f3f6c00481e5271341f955bccb1cfc3b274f7599'


monotone --db={your.database} diff 
--revision=b4787bd05558f1af4cd305637bc018dcee042b2e 
--revision=60dc2c8093b5c24a829066951af1b5910f68a34a
monotone --db={your.database} diff 
--revision=f3f6c00481e5271341f955bccb1cfc3b274f7599 
--revision=60dc2c8093b5c24a829066951af1b5910f68a34a
----------------------------------------------------------------------