[Monotone-commits-diffs] Revision dccb1123a52260a58338faaa546442823ff3c534

[monotone]

-----------------------------------------------------------------
Revision: dccb1123a52260a58338faaa546442823ff3c534
Ancestor: 0696e94d7a3ea2ce7c38db5f613b8a6de45fc881
Ancestor: f53b99baab69204e1f3ebde2190e501d0dba93a0
Author: Timothy Brownawell  <address@hidden>
Date: 2009-09-28T00:45:39
Branch: net.venge.monotone.tbrownaw.serve_automate.single_port

Added files:
        automate_ostream.hh automate_reader.cc automate_reader.hh
        network/automate_session.cc network/automate_session.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
        tests/importing_cvs_metadata/__driver__.lua
        tests/importing_cvs_metadata/cvs-repository/test/test.txt,v
        tests/importing_cvs_metadata/expected_log_output
        tests/serve-automate/__driver__.lua
Added directories:
        network tests/importing_cvs_metadata
        tests/importing_cvs_metadata/cvs-repository
        tests/importing_cvs_metadata/cvs-repository/test
        tests/serve-automate
Modified files:
        INSTALL Makefile.am NEWS UPGRADE automate.cc base.hh cmd.hh
        cmd_automate.cc cmd_diff_log.cc cmd_netsync.cc
        cmd_ws_commit.cc configure.ac enumerator.cc enumerator.hh
        file_io.cc file_io.hh key_store.cc lua.cc lua_hooks.cc
        lua_hooks.hh m4/library.m4 monotone.texi netcmd.cc netcmd.hh
        netsync.cc paths.cc paths.hh platform-wrapped.hh platform.hh
        po/de.po po/it.po rcs_import.cc sanity.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/empty_environment/__driver__.lua
        tests/importing_files_with_non-english_names/__driver__.lua
        tests/key_files_created_securely/__driver__.lua
        tests/netsync_negotiation/__driver__.lua
        tests/skip_invalid_paths/__driver__.lua unit-tests/netcmd.cc
        unix/fs.cc unix/tester-plaf.cc visualc/config.h win32/README
        win32/fs.cc win32/monotone.iss win32/tester-plaf.cc work.cc

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=0696e94d7a3ea2ce7c38db5f613b8a6de45fc881 
--revision=dccb1123a52260a58338faaa546442823ff3c534
monotone --db={your.database} diff 
--revision=f53b99baab69204e1f3ebde2190e501d0dba93a0 
--revision=dccb1123a52260a58338faaa546442823ff3c534
----------------------------------------------------------------------