[Monotone-commits-nodiffs] Revision 00d4d5da7551f16906b7d23b5e59bf01a69cfe5f

[monotone]

-----------------------------------------------------------------
Revision: 00d4d5da7551f16906b7d23b5e59bf01a69cfe5f
Ancestor: 7ac32ed650e349c66854c95aa0c35a226cb40133
Ancestor: c4007197c145794b99ddaa2e6f7e2bc4c014714f
Author: Timothy Brownawell  <address@hidden>
Date: 2008-04-02T11:04:22
Branch: net.venge.monotone

Added files:
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        
tests/schema_migration/212dd25a23bfd7bfe030ab910e9d62aa66aa2955.mtn.dumped
        tests/schema_migration_error_recovery/bad_hexenc.dump
        tests/schema_migration_error_recovery/short_hexenc.dump
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 debian/changelog
        debian/monotone-server.postinst diff_patch.cc enumerator.cc
        enumerator.hh epoch.cc file_io.cc file_io.hh globish.cc
        graph.cc graph.hh key_store.cc key_store.hh keys.cc keys.hh
        legacy.cc lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        merkle_tree.cc merkle_tree.hh monotone.texi netsync.cc
        packet.cc po/de.po po/es.po po/sv.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
        sanity.cc sanity.hh schema.sql schema_migration.cc
        selectors.cc sha1.cc tests/database_check/__driver__.lua
        tests/db_check_(heights)/__driver__.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/netsync_mtn_uri_scheme/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_error_recovery/__driver__.lua
        transforms.cc transforms.hh uri.cc uri.hh vocab.cc vocab.hh
        vocab_hash.hh vocab_macros.hh vocab_terms.hh work.cc
        work_migration.cc xdelta.cc xdelta.hh

ChangeLog: 

merge of '7ac32ed650e349c66854c95aa0c35a226cb40133'
     and 'c4007197c145794b99ddaa2e6f7e2bc4c014714f'


monotone --db={your.database} diff 
--revision=7ac32ed650e349c66854c95aa0c35a226cb40133 
--revision=00d4d5da7551f16906b7d23b5e59bf01a69cfe5f
monotone --db={your.database} diff 
--revision=c4007197c145794b99ddaa2e6f7e2bc4c014714f 
--revision=00d4d5da7551f16906b7d23b5e59bf01a69cfe5f
----------------------------------------------------------------------