[Monotone-commits-diffs] Revision aed5b6fb30c941bb020c55aa1c0cad78141931ad

[monotone]

-----------------------------------------------------------------
Revision: aed5b6fb30c941bb020c55aa1c0cad78141931ad
Ancestor: 3c3550db3323bd338eb9c756ef2e406a31f44250
Ancestor: f63cd1bf5ff12f59603ce3b234be51f9a49868c2
Author: address@hidden
Date: 2006-01-11T15:50:00
Branch: net.venge.monotone.levitte.select-heads-of

Deleted entries:
        change_set.cc change_set.hh manifest.cc manifest.hh
        po/pt_BR.po tests/t_automate_get_manifest.at
        tests/t_rebuild.at win32/wcwidth.c
Renamed entries:
        tests/t_migrate_schema.at to tests/t_migrate_rosterify.at
Added files:
        cset.cc cset.hh enumerator.cc enumerator.hh legacy.cc
        legacy.hh merge.cc merge.hh parallel_iter.hh po/pt_BR.po
        refiner.cc refiner.hh roster.cc roster.hh roster_merge.cc
        roster_merge.hh safe_map.hh
        tests/t_automate_get_manifest_of.at
        tests/t_heads_of_certs.at tests/t_migrate_schema.at
        tests/t_revert_ignored.at tests/t_rosterify_attrs.at
        tests/t_rosterify_drop_attrs.at tests/t_rosterify_one_rev.at
        tests/t_rosterify_rename.at tests/t_selectors_b_h.at
Modified files:
        ChangeLog 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 contrib/ciabot_monotone.py contrib/usher.cc
        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.cc inodeprint.hh key_store.cc
        lua/liolib.c lua.cc lua.hh merkle_tree.cc merkle_tree.hh
        monotone.1 monotone.cc monotone.spec monotone.texi netcmd.cc
        netcmd.hh netsync.cc options.hh packet.cc packet.hh paths.cc
        paths.hh platform.hh po/Makevars po/POTFILES.in po/fr.po
        po/ja.po rcs_import.cc restrictions.cc restrictions.hh
        revision.cc revision.hh sanity.cc sanity.hh schema.sql
        schema_migration.cc selectors.cc selectors.hh std_hooks.lua
        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_attr_drop.at tests/t_attr_init.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_database_check_normalized.at tests/t_drop_attr.at
        tests/t_epoch.at tests/t_epoch_server.at tests/t_erename.at
        tests/t_explicit_merge_with_anc.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_merge_manual.at tests/t_migrate_rosterify.at
        tests/t_movedel.at tests/t_movepatch.at
        tests/t_netsync_exclude.at tests/t_netsync_nocerts.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_revert_restrict.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_subdir_attr.at
        tests/t_subdirs.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 ui.cc ui.hh unit_tests.cc
        unit_tests.hh unix/process.cc update.cc update.hh vocab.cc
        vocab.hh vocab_terms.hh win32/monotone.iss work.cc work.hh
        xdelta.cc xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
3c3550db3323bd338eb9c756ef2e406a31f44250)
            to branch 'net.venge.monotone.levitte.select-heads-of' (head 
f63cd1bf5ff12f59603ce3b234be51f9a49868c2)


monotone --db={your.database} diff 
--revision=3c3550db3323bd338eb9c756ef2e406a31f44250 
--revision=aed5b6fb30c941bb020c55aa1c0cad78141931ad
monotone --db={your.database} diff 
--revision=f63cd1bf5ff12f59603ce3b234be51f9a49868c2 
--revision=aed5b6fb30c941bb020c55aa1c0cad78141931ad
----------------------------------------------------------------------