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

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

[Monotone-commits-diffs] Revision da7852695186a6b31618d168f936bf90248d3d


From: monotone
Subject: [Monotone-commits-diffs] Revision da7852695186a6b31618d168f936bf90248d3ded
Date: Tue, 23 Mar 2010 04:30:38 +0100

-----------------------------------------------------------------
Revision: da7852695186a6b31618d168f936bf90248d3ded
Ancestor: dcefba4279e31970aa470b10b06a8e10dd2830e9
Ancestor: ea0dab7ddf91700029c8c12932b00dd2a1693509
Author: Timothy Brownawell  <address@hidden>
Date: 03/22/10 00:48:23
Branch: net.venge.monotone.tbrownaw.policy-branches

Added files:
        branch_name.cc branch_name.hh cache_logger.cc
        cache_logger.hh cmd_policy.cc
        contrib/command/remote_export.lua cow_trie.hh images/bg.png
        images/go-next.png images/go-previous.png images/go-up.png
        images/toc.png po/pt.po policies/base_policy.cc
        policies/base_policy.hh policies/branch.cc
        policies/branch.hh policies/delegation.cc
        policies/delegation.hh policies/editable_policy.cc
        policies/editable_policy.hh policies/policy.cc
        policies/policy.hh policies/policy_branch.cc
        policies/policy_branch.hh
        tests/automate_netsync/__driver__.lua
        tests/automate_stdio_band_output/__driver__.lua
        tests/bisect/__driver__.lua
        tests/bisect_blocked/__driver__.lua
        tests/bisect_linear/__driver__.lua
        tests/common/automate_stdio.lua
        tests/diagnostics_with--timestamps/__driver__.lua
        tests/git_export_invalid_mapped_author/__driver__.lua
        tests/git_export_unmapped_authors/__driver__.lua
        tests/netsync_stop_server/__driver__.lua
        tests/policy-basic/__driver__.lua
        tests/policy-netsync/__driver__.lua
        tests/policy-subpolicies/__driver__.lua
        tests/policy-tags/__driver__.lua
        
tests/schema_migration/9c8d5a9ea8e29c69be6459300982a68321b0ec12.mtn.dumped
Added directories:
        images policies tests/automate_netsync
        tests/automate_stdio_band_output tests/bisect
        tests/bisect_blocked tests/bisect_linear
        tests/diagnostics_with--timestamps
        tests/git_export_invalid_mapped_author
        tests/git_export_unmapped_authors tests/netsync_stop_server
        tests/policy-basic tests/policy-netsync
        tests/policy-subpolicies tests/policy-tags
Modified files:
        AUTHORS HACKING INSTALL Makefile.am NEWS UPGRADE ancestry.cc
        annotate.cc annotate.hh asciik.cc automate.cc
        automate_ostream.hh automate_ostream_demuxed.hh 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 configure.ac
        constants.hh contrib/get_passphrase_from_file.lua
        contrib/monotone-cluster-push.lua
        contrib/monotone-mail-notify.lua contrib/monotone-mirror.lua
        database.cc database.hh database_check.cc dates.cc
        enumerator.cc enumerator.hh epoch.cc epoch.hh file_io.hh
        git_export.cc git_export.hh gzip.cc key_store.cc
        lru_writeback_cache.hh lua-testsuite.lua lua_hooks.cc
        lua_hooks.hh luaext_platform.cc merge_conflict.cc
        merge_content.cc merge_roster.cc migrate_ancestry.cc
        migrate_schema.cc monotone.texi netcmd.cc netcmd.hh
        netsync.cc network/automate_session.cc
        network/automate_session.hh network/listener.cc
        network/netsync_session.cc network/netsync_session.hh
        network/reactor.cc network/session.cc network/session.hh
        network/wrapped_session.hh netxx/socket.cxx
        notes/release-checklist.txt options.hh options_list.hh
        origin_type.hh paths.hh platform.hh po/LINGUAS po/de.po
        po/it.po po/sv.po policies/policy_branch.cc project.cc
        project.hh restrictions.cc rev_types.hh revision.hh
        roster.cc roster.hh roster_delta.cc roster_delta.hh
        sanity.cc sanity.hh schema.sql selectors.cc selectors.hh
        sha1.cc simplestring_xform.cc ssh_agent.cc std_hooks.lua
        tester.cc testlib.lua tests/automate_cert/__driver__.lua
        tests/automate_get_options/__driver__.lua
        tests/automate_heads/__driver__.lua
        tests/automate_identify/__driver__.lua
        tests/automate_inventory_options/__driver__.lua
        tests/automate_keys/__driver__.lua
        tests/automate_show_conflicts_defaults/__driver__.lua
        tests/automate_stdio/__driver__.lua
        tests/automate_stdio_options/__driver__.lua
        tests/automate_tags/__driver__.lua
        tests/commit_default_editor/test_hooks.lua
        tests/commit_use_workspace_keydir/__driver__.lua
        tests/common/netsync.lua
        tests/creating_a_bad_criss-cross_merge/__driver__.lua
        tests/database_check/__driver__.lua
        tests/date_formatting/__driver__.lua
        tests/db_execute/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/git_export/__driver__.lua
        tests/git_export_rename_loop/__driver__.lua
        tests/importing_cvs_metadata/__driver__.lua
        tests/importing_files_with_non-english_names/__driver__.lua
        tests/manifest_restrictions/__driver__.lua
        tests/netsync_negotiation/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/serve-automate/__driver__.lua
        tests/short_options_work_correctly/__driver__.lua
        tests/trust_hooks_and_trusted_command/__driver__.lua
        tests/util_mtnopt/__driver__.lua
        tests/wrong_options_override_workspace_options/__driver__.lua
        texinfo.css transforms.hh ui.cc ui.hh unit-tests/cset.cc
        unit-tests/merge_roster.cc unit-tests/netcmd.cc
        unit-tests/roster.cc unit_tester.cc visualc/config.h
        vocab.hh vocab_terms.hh win32/main.cc win32/monotone.iss
        win32/process.cc win32/tester-plaf.cc work.cc work.hh
Modified attrs:
        images/bg.png images/go-next.png images/go-previous.png
        images/go-up.png images/toc.png
        tests/automate_stdio_band_output/__driver__.lua

ChangeLog: 

Merge in remaining mainline changes.


monotone --db={your.database} diff 
--revision=dcefba4279e31970aa470b10b06a8e10dd2830e9 
--revision=da7852695186a6b31618d168f936bf90248d3ded
monotone --db={your.database} diff 
--revision=ea0dab7ddf91700029c8c12932b00dd2a1693509 
--revision=da7852695186a6b31618d168f936bf90248d3ded
----------------------------------------------------------------------




reply via email to

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