[Monotone-commits-diffs] Revision a3d15015bc0bca4ff942e0b2a032948f958a48c3

[monotone]

-----------------------------------------------------------------
Revision: a3d15015bc0bca4ff942e0b2a032948f958a48c3
Ancestor: 1f2b776178d2cb8928a898277e0f02dc571bd3e7
Ancestor: 71239c6b3325d289e9760845519ea35b01713d8c
Author: Matt Johnston <address@hidden>
Date: 2005-12-02T07:08:07
Branch: net.venge.monotone.experiment.rosters

Deleted files:
        tests/t_automate_get_manifest.at tests/t_rebuild.at
Renamed files:
        tests/t_migrate_schema.at to tests/t_migrate_rosterify.at
Added files:
        cset.cc cset.hh merge.cc merge.hh parallel_iter.hh pch.hh
        roster.cc roster.hh roster_merge.cc roster_merge.hh
        safe_map.hh tests/t_automate_get_manifest_of.at
        tests/t_migrate_schema.at
Modified files:
        AUTHORS ChangeLog HACKING Makefile.am NEWS UPGRADE
        annotate.cc annotate.hh app_state.cc app_state.hh
        automate.cc basic_io.cc basic_io.hh commands.cc configure.ac
        constants.cc constants.hh database.cc database.hh
        database_check.cc debian/changelog diff_patch.cc
        diff_patch.hh file_io.cc file_io.hh hash_map.hh
        inodeprint.hh lua.cc lua/lapi.c lua/lgc.c lua/liolib.c
        lua/lvm.c manifest.cc manifest.hh merkle_tree.cc
        merkle_tree.hh monotone.cc monotone.spec monotone.texi
        netcmd.cc netsync.cc netxx/address.cxx packet.cc packet.hh
        paths.cc paths.hh po/Makevars rcs_import.cc restrictions.cc
        restrictions.hh revision.cc revision.hh schema.sql
        schema_migration.cc std_hooks.lua tests/README
        tests/t_add_edge.at tests/t_add_vs_commit.at
        tests/t_annotate.at tests/t_annotate_add_collision.at
        tests/t_annotate_branch_collision.at tests/t_attr.at
        tests/t_attributes.at tests/t_automate_get_revision.at
        tests/t_automate_inventory.at tests/t_automate_stdio.at
        tests/t_change_empty_file.at tests/t_checkout_options.at
        tests/t_cvsimport_drepper.at tests/t_cvsimport_drepper2.at
        tests/t_database_check.at tests/t_database_check_minor.at
        tests/t_database_check_normalized.at tests/t_drop_attr.at
        tests/t_dump_load.at tests/t_empty_env.at tests/t_epoch.at
        tests/t_epoch_server.at tests/t_erename.at
        tests/t_explicit_merge_with_anc.at tests/t_genkey.at
        tests/t_i18n_file.at tests/t_lf_crlf.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_merge_lca.at tests/t_migrate_rosterify.at
        tests/t_movedel.at tests/t_movepatch.at
        tests/t_netsync_exclude.at tests/t_netsync_largish_file.at
        tests/t_netsync_permissions.at
        tests/t_netsync_read_permissions.at
        tests/t_netsync_sigpipe.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_subdirs.at
        tests/t_update_1.at tests/t_update_2.at
        tests/t_update_to_revision.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 txt2c.cc ui.cc unit_tests.cc
        unit_tests.hh vocab.cc vocab.hh vocab_terms.hh win32/fs.cc
        win32/monotone.iss work.cc work.hh xdelta.cc xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
71239c6b3325d289e9760845519ea35b01713d8c)
            to branch 'net.venge.monotone.experiment.rosters' (head 
1f2b776178d2cb8928a898277e0f02dc571bd3e7)


monotone --db={your.database} diff 
--revision=1f2b776178d2cb8928a898277e0f02dc571bd3e7 
--revision=a3d15015bc0bca4ff942e0b2a032948f958a48c3
monotone --db={your.database} diff 
--revision=71239c6b3325d289e9760845519ea35b01713d8c 
--revision=a3d15015bc0bca4ff942e0b2a032948f958a48c3
----------------------------------------------------------------------