[Monotone-commits-diffs] Revision bcef138d52793caa48b6f88b85898ea9ac647dcb

[monotone]

-----------------------------------------------------------------
Revision: bcef138d52793caa48b6f88b85898ea9ac647dcb
Ancestor: 9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2
Ancestor: a7101eac421cbc65dde7989f77532e2fbe9f0dc9
Author: address@hidden
Date: 2008-02-05T09:42:43
Branch: net.venge.monotone.experiment.db-compaction

Added files:
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/merge_update_part_of_file/__driver__.lua
        tests/merge_update_part_of_file/after.diff
        tests/merge_update_part_of_file/before.diff
        tests/merge_update_part_of_file/onechange
        tests/merge_update_part_of_file/original
        tests/merge_update_part_of_file/twochanges
        tests/update_with_pending_modification/__driver__.lua
Added directories:
        tests/imp_test_filesync_confdir
        tests/merge_update_part_of_file
        tests/update_with_pending_modification
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
        tests/test_hooks.lua transforms.cc transforms.hh vocab.cc
        vocab.hh vocab_terms.hh work.cc xdelta.cc xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.experiment.encapsulation' (head 
9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2)
            to branch 'net.venge.monotone.experiment.db-compaction' (head 
a7101eac421cbc65dde7989f77532e2fbe9f0dc9)


monotone --db={your.database} diff 
--revision=9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2 
--revision=bcef138d52793caa48b6f88b85898ea9ac647dcb
monotone --db={your.database} diff 
--revision=a7101eac421cbc65dde7989f77532e2fbe9f0dc9 
--revision=bcef138d52793caa48b6f88b85898ea9ac647dcb
----------------------------------------------------------------------