[Monotone-commits-diffs] Revision 3e37bd890fa9d4d4c0c792df30013a50b7167574

[monotone]

-----------------------------------------------------------------
Revision: 3e37bd890fa9d4d4c0c792df30013a50b7167574
Ancestor: 2108aa353d8e75811c25ee6948fbfaed7d9af9fa
Ancestor: 62e634c9eeb82f8a88ba6f90ea1ebbce32780cae
Author: Timothy Brownawell  <address@hidden>
Date: 2009-04-02T00:04:23
Branch: net.venge.monotone.contrib.usher

Deleted entries:
        bootstrap
Renamed entries:
        administrator.cc to src/administrator.cc
        administrator.hh to src/administrator.hh
        basic_io_serverlist_reader.cc to src/basic_io_serverlist_reader.cc
        basic_io_serverlist_reader.hh to src/basic_io_serverlist_reader.hh
        buffer.cc to src/buffer.cc
        buffer.hh to src/buffer.hh
        channel.cc to src/channel.cc
        channel.hh to src/channel.hh
        err.cc to src/err.cc
        err.hh to src/err.hh
        forked_server_manager.cc to src/forked_server_manager.cc
        forked_server_manager.hh to src/forked_server_manager.hh
        io.cc to src/io.cc
        io.hh to src/io.hh
        query_client.cc to src/query_client.cc
        query_client.hh to src/query_client.hh
        server.cc to src/server.cc
        server.hh to src/server.hh
        server_manager.cc to src/server_manager.cc
        server_manager.hh to src/server_manager.hh
        serverlist_reader.cc to src/serverlist_reader.cc
        serverlist_reader.hh to src/serverlist_reader.hh
        sock.cc to src/sock.cc
        sock.hh to src/sock.hh
        usher.cc to src/usher.cc
Added files:
        test/monotonerc test/populate-branch.sh test/run-tests.sh
        test/test1/databases.txt test/test1/script.txt
        test/test1/usher.conf test/usher.conf.head
Added directories:
        src test test/test1
Modified files:
        Makefile.am configure.in src/administrator.cc
        src/basic_io_serverlist_reader.cc src/server.cc
Modified attrs:
        test/populate-branch.sh test/run-tests.sh

ChangeLog: 

merge of '2108aa353d8e75811c25ee6948fbfaed7d9af9fa'
     and '62e634c9eeb82f8a88ba6f90ea1ebbce32780cae'


monotone --db={your.database} diff 
--revision=2108aa353d8e75811c25ee6948fbfaed7d9af9fa 
--revision=3e37bd890fa9d4d4c0c792df30013a50b7167574
monotone --db={your.database} diff 
--revision=62e634c9eeb82f8a88ba6f90ea1ebbce32780cae 
--revision=3e37bd890fa9d4d4c0c792df30013a50b7167574
----------------------------------------------------------------------