[Monotone-commits-diffs] Revision 831d320cbfc1f600a58db27f496663ed86e8ebf3

[monotone]

-----------------------------------------------------------------
Revision: 831d320cbfc1f600a58db27f496663ed86e8ebf3
Ancestor: 28142c406e5dc2a7ebc95cef35c682b2547967fd
Ancestor: 8635dd4b7f5595ed8d39232c7222ecef6639eec2
Author: address@hidden
Date: 12/27/09 14:34:23
Branch: net.venge.monotone

Added files:
        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
Added directories:
        tests/automate_stdio_band_output tests/bisect
        tests/bisect_blocked tests/bisect_linear
        tests/diagnostics_with--timestamps
Modified files:
        Makefile.am NEWS ancestry.cc automate_ostream.hh
        automate_ostream_demuxed.hh cmd.hh cmd_automate.cc
        cmd_diff_log.cc cmd_netsync.cc cmd_ws_commit.cc
        contrib/get_passphrase_from_file.lua database.cc database.hh
        dates.cc git_export.cc key_store.cc migrate_schema.cc
        monotone.texi netcmd.cc netcmd.hh
        network/automate_session.cc network/automate_session.hh
        options_list.hh revision.hh sanity.cc sanity.hh sha1.cc
        ssh_agent.cc 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/serve-automate/__driver__.lua
        tests/wrong_options_override_workspace_options/__driver__.lua
        texinfo.css ui.cc ui.hh unit-tests/netcmd.cc work.cc work.hh
Modified attrs:
        tests/automate_stdio_band_output/__driver__.lua

ChangeLog: 

merge of '28142c406e5dc2a7ebc95cef35c682b2547967fd'
     and '8635dd4b7f5595ed8d39232c7222ecef6639eec2'


monotone --db={your.database} diff 
--revision=28142c406e5dc2a7ebc95cef35c682b2547967fd 
--revision=831d320cbfc1f600a58db27f496663ed86e8ebf3
monotone --db={your.database} diff 
--revision=8635dd4b7f5595ed8d39232c7222ecef6639eec2 
--revision=831d320cbfc1f600a58db27f496663ed86e8ebf3
----------------------------------------------------------------------