[Monotone-commits-diffs] Revision 5d40dbf98544fdbade5863491e85c75aa604fb11

[monotone]

-----------------------------------------------------------------
Revision: 5d40dbf98544fdbade5863491e85c75aa604fb11
Ancestor: 67a5c30e1c38753ca92bda29120299e4872ac34b
Ancestor: 92b2f5bde2a7c626528392878b181b6ef2572c89
Author: address@hidden
Date: 2008-03-27T22:35:35
Branch: net.venge.monotone.experiment.db-compaction

Added files:
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        
tests/schema_migration/212dd25a23bfd7bfe030ab910e9d62aa66aa2955.mtn.dumped
Added directories:
        tests/merge_with_conflicting_name_and_renamed_dir
Modified files:
        Makefile.am NEWS UPGRADE annotate.cc automate.cc basic_io.cc
        basic_io.hh cert.cc cert.hh cmd_db.cc cmd_diff_log.cc
        cmd_files.cc cmd_key_cert.cc cmd_list.cc cmd_merging.cc
        cmd_netsync.cc cmd_ws_commit.cc commands.cc constants.hh
        crypto_tests.cc cset.cc database.cc database.hh
        database_check.cc 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 merkle_tree.cc merkle_tree.hh
        netsync.cc packet.cc po/es.po project.cc project.hh
        rcs_import.cc refiner.cc restrictions.cc rev_types.hh
        revision.cc roster.cc roster_delta.cc roster_merge.cc
        schema.sql schema_migration.cc selectors.cc sha1.cc
        tester.cc tests/add_in_subdir/__driver__.lua
        tests/database_check/__driver__.lua
        tests/db_check_(heights)/__driver__.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/schema_migration/__driver__.lua transforms.cc
        transforms.hh update.cc vocab.cc vocab.hh vocab_hash.hh
        vocab_macros.hh vocab_terms.hh work.cc work_migration.cc
        xdelta.cc xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
67a5c30e1c38753ca92bda29120299e4872ac34b)
            to branch 'net.venge.monotone.experiment.db-compaction' (head 
92b2f5bde2a7c626528392878b181b6ef2572c89)


monotone --db={your.database} diff 
--revision=67a5c30e1c38753ca92bda29120299e4872ac34b 
--revision=5d40dbf98544fdbade5863491e85c75aa604fb11
monotone --db={your.database} diff 
--revision=92b2f5bde2a7c626528392878b181b6ef2572c89 
--revision=5d40dbf98544fdbade5863491e85c75aa604fb11
----------------------------------------------------------------------