[Monotone-commits-diffs] Revision 909027f85955d3de0405724607b67e5bfafe85f6

[monotone]

-----------------------------------------------------------------
Revision: 909027f85955d3de0405724607b67e5bfafe85f6
Ancestor: 10b783d7f6d9ff374af5d25117b92b62cac4f9c3
Ancestor: 1c823d7400275724d1c1c752eae184814fe403c6
Author: address@hidden
Date: 2007-08-10T11:35:55
Branch: net.venge.monotone
Branch: net.venge.monotone.suspend-cert

Deleted entries:
        contrib/serverctl-update.lua contrib/serverctl-update.sh
        contrib/serverctl.lua
Added files:
        contrib/Monotone.pm
        contrib/monotone-buildbot-notification.lua
        debian/monotone.manpages debian/mtn.1 sqlite/btreeInt.h
        sqlite/limits.h sqlite/malloc.c sqlite/vdbeblob.c
        tests/suspend/__driver__.lua
        tests/test_a_merge_9/__driver__.lua
        tests/test_a_merge_9/left tests/test_a_merge_9/parent
        tests/test_a_merge_9/right visualc/runtests.bat
        visualc/unit_tests.vcproj
Added directories:
        tests/suspend tests/test_a_merge_9
Modified files:
        AUTHORS INSTALL Makefile.am NEWS UPGRADE automate.cc
        botan/mem_pool.cpp botan/mem_pool.h cert.cc cert.hh
        cmd_key_cert.cc cmd_list.cc cmd_netsync.cc cmd_ws_commit.cc
        commands.cc configure.ac contrib/README
        contrib/ext_hooks_expand.pl contrib/monotone-notify.pl
        contrib/monotone.bash_completion database.cc
        debian/changelog debian/control
        debian/monotone-server.postinst
        debian/monotone-server.postrm debian/rules debian/watch
        file_io.cc file_io.hh key_store.cc keys.cc lua.cc
        m4/boost.m4 m4/sqlite.m4 monotone.spec monotone.texi
        options_list.hh paths.cc paths.hh platform.hh po/de.po
        po/es.po po/it.po po/pt_BR.po po/sv.po project.cc project.hh
        revision.cc schema_migration.cc sqlite/alter.c
        sqlite/analyze.c sqlite/attach.c sqlite/auth.c
        sqlite/btree.c sqlite/btree.h sqlite/build.c
        sqlite/callback.c sqlite/date.c sqlite/expr.c sqlite/func.c
        sqlite/insert.c sqlite/keywordhash.h sqlite/legacy.c
        sqlite/main.c sqlite/opcodes.c sqlite/opcodes.h sqlite/os.c
        sqlite/os.h sqlite/os_unix.c sqlite/os_win.c sqlite/pager.c
        sqlite/pager.h sqlite/parse.c sqlite/pragma.c
        sqlite/prepare.c sqlite/printf.c sqlite/select.c
        sqlite/sqlite3.h sqlite/sqliteInt.h sqlite/table.c
        sqlite/tokenize.c sqlite/utf.c sqlite/util.c sqlite/vdbe.c
        sqlite/vdbe.h sqlite/vdbeInt.h sqlite/vdbeapi.c
        sqlite/vdbeaux.c sqlite/vdbemem.c sqlite/vtab.c
        sqlite/where.c tester.cc
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/invalid_--root_settings/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/rename_file_to_dir/__driver__.lua
        
tests/schema_migration/7ca81b45279403419581d7fde31ed888a80bd34e.mtn.dumped
        tests/ws_ops_with_wrong_node_type/__driver__.lua txt2c.cc
        unix/fs.cc unix/process.cc update.cc visualc/botan.vcproj
        visualc/config.h visualc/lua.vcproj visualc/monotone.sln
        visualc/monotone.vcproj visualc/netxx.vcproj
        visualc/sqlite3.vcproj visualc/tester.vcproj
        visualc/txt2c.vcproj win32/fs.cc win32/monotone.iss work.cc
        work_migration.cc

ChangeLog: 

explicit merge of '10b783d7f6d9ff374af5d25117b92b62cac4f9c3'
              and '1c823d7400275724d1c1c752eae184814fe403c6'


monotone --db={your.database} diff 
--revision=10b783d7f6d9ff374af5d25117b92b62cac4f9c3 
--revision=909027f85955d3de0405724607b67e5bfafe85f6
monotone --db={your.database} diff 
--revision=1c823d7400275724d1c1c752eae184814fe403c6 
--revision=909027f85955d3de0405724607b67e5bfafe85f6
----------------------------------------------------------------------