[Monotone-commits-diffs] Revision 865d837f5a3074d51398dcace842a4d03f36634c

[monotone]

-----------------------------------------------------------------
Revision: 865d837f5a3074d51398dcace842a4d03f36634c
Ancestor: 0173ccba8762d52eb8bf6b5ede7dfed1305a274b
Ancestor: c3140da1514f0d8f88ff7341b41e6522cead15bc
Author: address@hidden
Date: 2008-02-04T16:42:46
Branch: net.venge.monotone.experiment.db-compaction

Modified files:
        Makefile.am NEWS automate.cc basic_io.cc basic_io.hh cert.cc
        cert.hh cmd_files.cc cmd_key_cert.cc cmd_list.cc
        cmd_ws_commit.cc crypto_tests.cc cset.cc database.cc
        database.hh diff_patch.cc enumerator.cc enumerator.hh
        epoch.cc file_io.cc file_io.hh graph.cc graph.hh
        key_store.cc key_store.hh keys.cc keys.hh legacy.cc
        lua_hooks.cc lua_hooks.hh netsync.cc packet.cc project.cc
        project.hh rcs_import.cc revision.cc roster.cc
        roster_delta.cc schema.sql schema_migration.cc sha1.cc
        tester.cc tests/database_check/__driver__.lua
        tests/db_check_(heights)/__driver__.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        transforms.cc transforms.hh vocab.cc vocab.hh vocab_terms.hh
        work.cc xdelta.cc xdelta.hh

ChangeLog: 

explicit merge of '0173ccba8762d52eb8bf6b5ede7dfed1305a274b'
              and 'c3140da1514f0d8f88ff7341b41e6522cead15bc'


monotone --db={your.database} diff 
--revision=0173ccba8762d52eb8bf6b5ede7dfed1305a274b 
--revision=865d837f5a3074d51398dcace842a4d03f36634c
monotone --db={your.database} diff 
--revision=c3140da1514f0d8f88ff7341b41e6522cead15bc 
--revision=865d837f5a3074d51398dcace842a4d03f36634c
----------------------------------------------------------------------