monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 9bc0f43c8cf0b8c990f5a38e236e0d0599473e


From: monotone
Subject: [Monotone-commits-diffs] Revision 9bc0f43c8cf0b8c990f5a38e236e0d0599473e6d
Date: Sun, 11 Jul 2010 20:11:17 +0200

-----------------------------------------------------------------
Revision: 9bc0f43c8cf0b8c990f5a38e236e0d0599473e6d
Ancestor: 709ea54b6dfc8e1eb3ae222ef72529ad19d5c9e9
Ancestor: b0327e6eb8d1617b46a335111ef1677ad23287ae
Author: Timothy Brownawell  <address@hidden>
Date: 07/10/10 18:59:06
Branch: net.venge.monotone.options

Added files:
        automate_stdio_helpers.hh date_format.hh
        option_reset_info.hh options_applicator.cc
        options_applicator.hh
        tests/cancelled_arguments/__driver__.lua
Added directories:
        tests/cancelled_arguments
Modified files:
        Makefile.am NEWS annotate.cc app_state.hh automate.cc cmd.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_ws_commit.cc commands.cc commands.hh
        contrib/monotone.bash_completion
        contrib/monotone.zsh_completion database.cc key_store.cc
        keys.cc lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        maybe_workspace_updater.cc merge_conflict.cc monotone.cc
        network/automate_session.cc option.cc option.hh options.cc
        options.hh options_list.hh project.cc restrictions.cc
        restrictions.hh sanity.cc sanity.hh
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/log_dir/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/test_the_version_command/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc ui.cc ui.hh unit-testsuite.lua
        unix/main.cc win32/main.cc work.cc

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=709ea54b6dfc8e1eb3ae222ef72529ad19d5c9e9 
--revision=9bc0f43c8cf0b8c990f5a38e236e0d0599473e6d
monotone --db={your.database} diff 
--revision=b0327e6eb8d1617b46a335111ef1677ad23287ae 
--revision=9bc0f43c8cf0b8c990f5a38e236e0d0599473e6d
----------------------------------------------------------------------



reply via email to

[Prev in Thread] Current Thread [Next in Thread]