[Monotone-commits-diffs] Revision 8bc159f4951c68d64310a78e76bb8188d081ab07

[monotone]

-----------------------------------------------------------------
Revision: 8bc159f4951c68d64310a78e76bb8188d081ab07
Ancestor: 5fdbc94ec06691f212ae8f1f75528bd3d7b74e5e
Ancestor: f6aaaf499b8f9019d9b11a2374d0d65524de3b8f
Author: address@hidden
Date: 2005-11-26T01:22:26
Branch: net.venge.monotone.experiment.rosters

Deleted files:
        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 Makefile.am annotate.cc annotate.hh app_state.cc
        app_state.hh automate.cc basic_io.cc basic_io.hh commands.cc
        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 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_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
        vocab.cc vocab.hh vocab_terms.hh work.cc work.hh xdelta.cc
        xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
f6aaaf499b8f9019d9b11a2374d0d65524de3b8f)
            to branch 'net.venge.monotone.experiment.rosters' (head 
5fdbc94ec06691f212ae8f1f75528bd3d7b74e5e)


monotone --db={your.database} diff 
--revision=5fdbc94ec06691f212ae8f1f75528bd3d7b74e5e 
--revision=8bc159f4951c68d64310a78e76bb8188d081ab07
monotone --db={your.database} diff 
--revision=f6aaaf499b8f9019d9b11a2374d0d65524de3b8f 
--revision=8bc159f4951c68d64310a78e76bb8188d081ab07
----------------------------------------------------------------------