[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 34d1d560ac2134bd7a27ab6c8cfac74f7d8b
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 34d1d560ac2134bd7a27ab6c8cfac74f7d8beccc |
Date: |
Mon, 14 Jun 2010 20:21:45 +0200 |
-----------------------------------------------------------------
Revision: 34d1d560ac2134bd7a27ab6c8cfac74f7d8beccc
Ancestor: 4dd8412cd6515bf1b9629e19dc336b520078dfb3
Ancestor: 904a4f0c2721422978658faeda26ebbb4420e4f1
Author: Timothy Brownawell <address@hidden>
Date: 2010-06-14 05.40.08
Branch: net.venge.monotone.options
Added files:
automate_stdio_helpers.hh option_reset_info.hh
options_applicator.cc options_applicator.hh
tests/cancelled_arguments/__driver__.lua
tests/extended-selectors/__driver__.lua
Added directories:
tests/cancelled_arguments tests/extended-selectors
Modified files:
Makefile.am NEWS UPGRADE app_state.hh automate.cc cmd.cc
cmd.hh cmd_automate.cc cmd_db.cc cmd_diff_log.cc
cmd_key_cert.cc cmd_merging.cc cmd_netsync.cc
cmd_ws_commit.cc commands.hh configure.ac
contrib/monotone.bash_completion
contrib/monotone.zsh_completion database.cc key_store.cc
lua-testsuite.lua lua_hooks.cc lua_hooks.hh
maybe_workspace_updater.cc monotone.cc monotone.texi
network/automate_session.cc option.cc option.hh options.cc
options.hh options_list.hh po/de.po po/es.po po/fr.po
po/it.po po/ja.po po/pt.po po/pt_BR.po po/sv.po sanity.cc
sanity.hh selectors.cc
tests/default_command_options/__driver__.lua
tests/default_command_options/default_options.lua
tests/test_the_version_command/__driver__.lua
tests/user_commands/__driver__.lua
tests/user_commands/extra_rc ui.cc ui.hh unit-tests/dates.cc
unit-testsuite.lua unix/main.cc visualc/config.h
win32/main.cc work.cc
ChangeLog:
merge in mainline changes
monotone --db={your.database} diff
--revision=4dd8412cd6515bf1b9629e19dc336b520078dfb3
--revision=34d1d560ac2134bd7a27ab6c8cfac74f7d8beccc
monotone --db={your.database} diff
--revision=904a4f0c2721422978658faeda26ebbb4420e4f1
--revision=34d1d560ac2134bd7a27ab6c8cfac74f7d8beccc
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 34d1d560ac2134bd7a27ab6c8cfac74f7d8beccc,
monotone <=