[Monotone-commits-nodiffs] Revision 5fdbc94ec06691f212ae8f1f75528bd3d7b74e5e

[monotone]

-----------------------------------------------------------------
Revision: 5fdbc94ec06691f212ae8f1f75528bd3d7b74e5e
Ancestor: 42fcbbfec6e29089cdef68dd36cb49c7cdc216e8
Ancestor: 664878b6d4a22f6266f9026372653bb1cec737d3
Author: address@hidden
Date: 2005-11-25T18:47:12
Branch: net.venge.monotone.experiment.rosters

Deleted files:
        botan/omac.h tests/t_automate_get_manifest.at
        tests/t_rebuild.at
Added files:
        cset.cc cset.hh merge.cc merge.hh parallel_iter.hh roster.cc
        roster.hh roster_merge.cc roster_merge.hh safe_map.hh
        tests/t_automate_get_manifest_of.at
Modified files:
        ChangeLog INSTALL Makefile.am NEWS annotate.cc annotate.hh
        app_state.cc app_state.hh automate.cc basic_io.cc
        basic_io.hh botan/aes_tab.cpp botan/arc4.cpp
        botan/authors.txt botan/des.cpp botan/des.h
        botan/des_tab.cpp botan/eax.cpp botan/eax.h
        botan/es_capi.cpp botan/es_capi.h botan/es_egd.cpp
        botan/es_egd.h botan/license.txt botan/mem_pool.cpp
        botan/policy.cpp botan/pubkey.cpp botan/pubkey.h
        botan/thanks.txt botan/util.cpp botan/util.h
        botan/x931_rng.cpp botan/x931_rng.h commands.cc
        contrib/mtbrowse.sh database.cc database.hh
        database_check.cc diff_patch.cc diff_patch.hh file_io.cc
        file_io.hh hash_map.hh lua.cc lua/liolib.c manifest.cc
        manifest.hh merkle_tree.cc merkle_tree.hh monotone.texi
        netcmd.cc netsync.cc packet.cc packet.hh paths.cc paths.hh
        platform.hh rcs_import.cc restrictions.cc restrictions.hh
        revision.cc revision.hh schema.sql schema_migration.cc
        tests/t_add_edge.at tests/t_add_vs_commit.at
        tests/t_annotate.at tests/t_attr.at tests/t_attributes.at
        tests/t_automate_get_revision.at
        tests/t_automate_inventory.at tests/t_change_empty_file.at
        tests/t_cvsimport_drepper.at tests/t_cvsimport_drepper2.at
        tests/t_database_check.at tests/t_database_check_minor.at
        tests/t_drop_attr.at tests/t_dump_load.at tests/t_epoch.at
        tests/t_epoch_server.at tests/t_erename.at
        tests/t_i18n_file.at tests/t_log_nonexistent.at
        tests/t_ls_known.at tests/t_merge2_add.at
        tests/t_merge2_add_drop_add.at tests/t_merge2_data.at
        tests/t_merge_add_del.at tests/t_movedel.at
        tests/t_movepatch.at tests/t_netsync_permissions.at
        tests/t_netsync_read_permissions.at
        tests/t_netsync_unrelated.at tests/t_normalized_filenames.at
        tests/t_related_merge2_data.at tests/t_remerge.at
        tests/t_rename.at tests/t_rename_attr.at
        tests/t_rename_diff_names.at
        tests/t_rename_dir_add_dir_with_old_name.at
        tests/t_renamed.at tests/t_scan.at tests/t_select_cert.at
        tests/t_selector_later_earlier.at tests/t_status.at
        tests/t_sticky_branch.at tests/t_update_with_pending_add.at
        tests/t_update_with_pending_drop.at
        tests/t_update_with_pending_rename.at testsuite.at
        transforms.cc transforms.hh unit_tests.cc unit_tests.hh
        unix/fs.cc vocab.cc vocab.hh vocab_terms.hh win32/fs.cc
        work.cc work.hh xdelta.cc xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
664878b6d4a22f6266f9026372653bb1cec737d3)
            to branch 'net.venge.monotone.experiment.rosters' (head 
42fcbbfec6e29089cdef68dd36cb49c7cdc216e8)


monotone --db={your.database} diff 
--revision=42fcbbfec6e29089cdef68dd36cb49c7cdc216e8 
--revision=5fdbc94ec06691f212ae8f1f75528bd3d7b74e5e
monotone --db={your.database} diff 
--revision=664878b6d4a22f6266f9026372653bb1cec737d3 
--revision=5fdbc94ec06691f212ae8f1f75528bd3d7b74e5e
----------------------------------------------------------------------