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

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

[Monotone-commits-diffs] Revision 0422a7ef26ec104049ea29c1bc6e55262aded5


From: monotone
Subject: [Monotone-commits-diffs] Revision 0422a7ef26ec104049ea29c1bc6e55262aded5e2
Date: Sat, 13 Mar 2010 19:09:27 +0100

-----------------------------------------------------------------
Revision: 0422a7ef26ec104049ea29c1bc6e55262aded5e2
Ancestor: 6fd0081d4cf31468fdb83727e523594e9adeb187
Ancestor: 845376828818bd8c8c85b19bb9e4ef5c6dc44373
Author: address@hidden
Date: 03/07/2010 07:17:34 AM
Branch: net.venge.monotone

Added files:
        cache_logger.cc cache_logger.hh
        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
        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/schema_migration/9c8d5a9ea8e29c69be6459300982a68321b0ec12.mtn.dumped
Added directories:
        images 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
Modified files:
        AUTHORS HACKING INSTALL Makefile.am NEWS UPGRADE ancestry.cc
        annotate.cc annotate.hh automate.cc automate_ostream.hh
        automate_ostream_demuxed.hh cmd.hh cmd_automate.cc
        cmd_diff_log.cc cmd_files.cc cmd_merging.cc cmd_netsync.cc
        cmd_othervcs.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 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 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/reactor.cc network/session.cc network/session.hh
        network/wrapped_session.hh netxx/socket.cxx
        notes/release-checklist.txt options_list.hh paths.hh
        platform.hh po/LINGUAS po/de.po po/it.po po/sv.po project.cc
        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 sha1.cc ssh_agent.cc std_hooks.lua
        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 ui.cc ui.hh unit-tests/cset.cc
        unit-tests/merge_roster.cc unit-tests/netcmd.cc
        unit-tests/roster.cc visualc/config.h win32/main.cc
        win32/monotone.iss win32/process.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 of '6fd0081d4cf31468fdb83727e523594e9adeb187'
     and '845376828818bd8c8c85b19bb9e4ef5c6dc44373'


monotone --db={your.database} diff 
--revision=6fd0081d4cf31468fdb83727e523594e9adeb187 
--revision=0422a7ef26ec104049ea29c1bc6e55262aded5e2
monotone --db={your.database} diff 
--revision=845376828818bd8c8c85b19bb9e4ef5c6dc44373 
--revision=0422a7ef26ec104049ea29c1bc6e55262aded5e2
----------------------------------------------------------------------




reply via email to

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