[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 6e7a99884d133e791a95f3cbbf0f7862d17fa0
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 6e7a99884d133e791a95f3cbbf0f7862d17fa032 |
Date: |
Thu, 19 Nov 2009 16:05:48 +0100 |
-----------------------------------------------------------------
Revision: 6e7a99884d133e791a95f3cbbf0f7862d17fa032
Ancestor: a0f9c8b2ea813f2546f718edb5d26471ed13b29d
Ancestor: acfee81edcc1e4e4c1db1c12c161a4465b18a258
Author: Timothy Brownawell <address@hidden>
Date: 2009-11-01T20:06:42
Branch: net.venge.monotone.tbrownaw.policy-branches
Added files:
automate_ostream.hh automate_ostream_demuxed.hh
automate_reader.cc automate_reader.hh branch_name.cc
branch_name.hh cmd_policy.cc editable_policy.cc
editable_policy.hh network/automate_session.cc
network/automate_session.hh network/connection_info.cc
network/connection_info.hh network/listener.cc
network/listener.hh network/listener_base.cc
network/listener_base.hh network/make_server.cc
network/make_server.hh network/netsync.txt
network/netsync_session.cc network/netsync_session.hh
network/reactable.cc network/reactable.hh network/reactor.cc
network/reactor.hh network/session.cc network/session.hh
network/session_base.cc network/session_base.hh
network/wrapped_session.cc network/wrapped_session.hh
policy.cc policy.hh tests/db_fix_certs/__driver__.lua
tests/db_fix_certs/generate-db.sh
tests/db_fix_certs/other_key tests/db_fix_certs/test.mtn
tests/importing_cvs_metadata/__driver__.lua
tests/importing_cvs_metadata/cvs-repository/test/test.txt,v
tests/importing_cvs_metadata/expected_log_output
tests/in_memory_database/__driver__.lua
tests/netsync_negotiation/__driver__.lua
tests/netsync_negotiation/netsync6.lua
tests/policy-basic/__driver__.lua
tests/policy-netsync/__driver__.lua
tests/policy-subpolicies/__driver__.lua
tests/policy-tags/__driver__.lua
tests/resolve_conflicts_all_resolutions/show_first-gui_left
tests/resolve_conflicts_all_resolutions/show_first-gui_right
tests/resolve_conflicts_all_resolutions/show_remaining-gui_left
tests/resolve_conflicts_duplicate_name_directory/__driver__.lua
tests/resolve_conflicts_orphaned_file/__driver__.lua
tests/serve-automate/__driver__.lua
tests/serve-automate-single-run/__driver__.lua
Added directories:
network tests/db_fix_certs tests/importing_cvs_metadata
tests/importing_cvs_metadata/cvs-repository
tests/importing_cvs_metadata/cvs-repository/test
tests/in_memory_database tests/netsync_negotiation
tests/policy-basic tests/policy-netsync
tests/policy-subpolicies tests/policy-tags
tests/resolve_conflicts_duplicate_name_directory
tests/resolve_conflicts_orphaned_file tests/serve-automate
tests/serve-automate-single-run
Modified files:
INSTALL Makefile.am NEWS UPGRADE asciik.cc automate.cc
base.hh cert.cc cert.hh charset.cc charset.hh cmd.hh
cmd_automate.cc cmd_conflicts.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 configure.ac constants.hh database.cc
database.hh enumerator.cc enumerator.hh epoch.cc epoch.hh
file_io.cc file_io.hh git_export.cc key_store.cc
key_store.hh lua-testsuite.lua lua.cc lua_hooks.cc
lua_hooks.hh luaext_platform.cc m4/library.m4
merge_conflict.cc merge_content.cc merge_roster.cc
merge_roster.hh migrate_ancestry.cc migrate_schema.cc
monotone.texi netcmd.cc netcmd.hh netsync.cc
network/netsync_session.cc network/netsync_session.hh
options.cc options.hh options_list.hh paths.cc paths.hh
platform-wrapped.hh platform.hh po/de.po po/it.po po/sv.po
project.cc project.hh rcs_import.cc sanity.cc selectors.cc
std_hooks.lua tester-plaf.hh tester.cc
tests/automate_get_attributes/__driver__.lua
tests/automate_set_drop_attribute/__driver__.lua
tests/automate_tags/__driver__.lua
tests/clone_branch_no_dir/__driver__.lua
tests/empty_environment/__driver__.lua
tests/generating_and_extracting_keys_and_certs/__driver__.lua
tests/git_export/__driver__.lua
tests/importing_files_with_non-english_names/__driver__.lua
tests/key_files_created_securely/__driver__.lua
tests/resolve_conflicts_all_resolutions/__driver__.lua
tests/resolve_conflicts_all_resolutions/conflicts-1
tests/resolve_conflicts_all_resolutions/conflicts-resolved
tests/resolve_conflicts_all_resolutions/merge-1
tests/resolve_conflicts_all_resolutions/show_first-checkout_left
tests/resolve_conflicts_all_resolutions/show_first-checkout_right
tests/resolve_conflicts_all_resolutions/show_first-thermostat
tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
tests/resolve_conflicts_content/conflicts-2
tests/resolve_conflicts_errors/__driver__.lua
tests/resolve_conflicts_read_all/missing-root_left
tests/resolve_conflicts_read_all/missing-root_right
tests/resolve_conflicts_read_all/orphaned-add_left
tests/resolve_conflicts_read_all/orphaned-add_right
tests/resolve_conflicts_read_all/orphaned-rename_left
tests/resolve_conflicts_read_all/orphaned-rename_right
tests/skip_invalid_paths/__driver__.lua
tests/ssh_agent/__driver__.lua unit-tests/netcmd.cc
unit-tests/uri.cc unix/fs.cc unix/tester-plaf.cc uri.cc
uri.hh visualc/config.h vocab_terms.hh win32/README
win32/fs.cc win32/monotone.iss win32/tester-plaf.cc work.cc
work.hh
Modified attrs:
tests/db_fix_certs/generate-db.sh
tests/db_fix_certs/test.mtn
ChangeLog:
Merge in mainline changes.
monotone --db={your.database} diff
--revision=a0f9c8b2ea813f2546f718edb5d26471ed13b29d
--revision=6e7a99884d133e791a95f3cbbf0f7862d17fa032
monotone --db={your.database} diff
--revision=acfee81edcc1e4e4c1db1c12c161a4465b18a258
--revision=6e7a99884d133e791a95f3cbbf0f7862d17fa032
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 6e7a99884d133e791a95f3cbbf0f7862d17fa032,
monotone <=