[Monotone-commits-nodiffs] Revision a8fbcbbb3ac5bcdb8fdbdc2f2586ecd08f698c99

[monotone]

-----------------------------------------------------------------
Revision: a8fbcbbb3ac5bcdb8fdbdc2f2586ecd08f698c99
Ancestor: c8958363ef240f8f05ffc36907a3c43a937fa4ed
Ancestor: f660d1dffae54a721b9556db0b0808e499383eda
Author: address@hidden
Date: 2005-11-21T00:57:24
Branch: net.venge.monotone.experiment.rosters

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
Modified files:
        ChangeLog INSTALL Makefile.am annotate.cc annotate.hh
        app_state.cc app_state.hh automate.cc basic_io.cc
        basic_io.hh cert.cc commands.cc database.cc database.hh
        database_check.cc debian/control diff_patch.cc diff_patch.hh
        file_io.cc file_io.hh hash_map.hh lua.cc manifest.cc
        manifest.hh merkle_tree.cc merkle_tree.hh monotone.cc
        monotone.texi netcmd.cc netsync.cc packet.cc packet.hh
        paths.cc paths.hh po/fr.po rcs_import.cc restrictions.cc
        restrictions.hh revision.cc revision.hh schema.sql
        schema_migration.cc std_hooks.lua tests/t_attributes.at
        tests/t_automate_inventory.at tests/t_change_empty_file.at
        tests/t_drop_attr.at tests/t_ls_known.at
        tests/t_netsync_permissions.at
        tests/t_netsync_read_permissions.at tests/t_rename_attr.at
        tests/t_rename_diff_names.at
        tests/t_rename_dir_add_dir_with_old_name.at tests/t_scan.at
        tests/t_status.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

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
c8958363ef240f8f05ffc36907a3c43a937fa4ed)
            to branch 'net.venge.monotone.experiment.rosters' (head 
f660d1dffae54a721b9556db0b0808e499383eda)


monotone --db={your.database} diff 
--revision=c8958363ef240f8f05ffc36907a3c43a937fa4ed 
--revision=a8fbcbbb3ac5bcdb8fdbdc2f2586ecd08f698c99
monotone --db={your.database} diff 
--revision=f660d1dffae54a721b9556db0b0808e499383eda 
--revision=a8fbcbbb3ac5bcdb8fdbdc2f2586ecd08f698c99
----------------------------------------------------------------------