[Monotone-commits-nodiffs] Revision b71efabd52c073e0bcacb66bb7895c8c6ea198f1

[monotone]

-----------------------------------------------------------------
Revision: b71efabd52c073e0bcacb66bb7895c8c6ea198f1
Ancestor: 11f015f795c53851dcfb69946bb3fb2fe0109981
Ancestor: b6fc89d5d26677e8db8e84f4fd42a035613f5ede
Author: Richard Levitte <address@hidden>
Date: 2009-03-12T19:51:32
Branch: net.venge.monotone.experiment.meta-selector

Deleted entries:
        ROADMAP botan/bit_ops.cpp botan/config.cpp botan/config.h
        botan/def_char.cpp botan/def_char.h botan/mp_sqr.cpp
        botan/pk_filts.cpp botan/pk_filts.h botan/x509stat.cpp
        botan/x509stat.h debian debian/NEWS debian/changelog
        debian/compat debian/control debian/copyright
        debian/monotone-doc.dirs debian/monotone-doc.docs
        debian/monotone-doc.info
        debian/monotone-server.README.Debian
        debian/monotone-server.TODO.Debian
        debian/monotone-server.config debian/monotone-server.dirs
        debian/monotone-server.examples
        debian/monotone-server.monotone.default
        debian/monotone-server.monotone.init
        debian/monotone-server.postinst
        debian/monotone-server.postrm
        debian/monotone-server.templates
        debian/monotone.README.Debian debian/monotone.TODO.Debian
        debian/monotone.dirs debian/monotone.docs
        debian/monotone.examples debian/monotone.manpages
        debian/mtn.1 debian/po debian/po/POTFILES.in debian/po/cs.po
        debian/po/de.po debian/po/fr.po debian/po/ja.po
        debian/po/nl.po debian/po/pt.po debian/po/sv.po
        debian/po/templates.pot debian/rules debian/shlibs.local
        debian/watch i18n.h indent_script m4/acx_pthread.m4
        m4/fexception.m4 m4/iconv_translit.m4 m4/localeworks.m4
        m4/pcre.m4 m4/sqlite.m4 m4/xgettextflag.m4 mkstemp.hh
        package_full_revision.h package_revision.h po/POTFILES.in
        po/POTFILES.skip po/remove-potcdate.sin smap.hh
        tests/syntax_errors_in_.mtn-ignore/stderr-ref
        tests/syntax_errors_in_.mtn-ignore/stdout-ref
Renamed entries:
        botan to Attic/botan
        botan/big_base.cpp to Attic/botan/bigint.cpp
        botan/fips140.cpp to Attic/botan/selftest.cpp
        botan/fips140.h to Attic/botan/selftest.h
        botan/mp_mul.cpp to Attic/botan/mp_karat.cpp
        crypto_tests.cc to unit-tests/sha1.cc
        diff_patch.cc to diff_output.cc
        diff_patch.hh to diff_output.hh
        idna to Attic/idna
        lua to Attic/lua
        merge.cc to merge_content.cc
        merge.hh to merge_content.hh
        numeric_vocab.cc to unit-tests/numeric_vocab.cc
        pcre to Attic/pcre
        pcre/pcrepattern.texi to pcrepattern.texi
        pcre/pcresyntax.texi to pcresyntax.texi
        roster_merge.cc to merge_roster.cc
        roster_merge.hh to merge_roster.hh
        schema_migration.cc to migrate_schema.cc
        schema_migration.hh to migration.hh
        sha1.hh to Attic/sha1.hh
        sha1_engine.hh to Attic/sha1_engine.hh
        sqlite to Attic/sqlite
        string_queue.cc to unit-tests/string_queue.cc
        tests/resolve_duplicate_name_conflict to 
tests/resolve_conflicts_duplicate_name
        unit_tests.cc to unit_tester.cc
        util/mtnopt to util/mtnopt.in
        work_migration.cc to migrate_work.cc
Added files:
        Attic/botan/bswap.h Attic/botan/mp_monty.cpp
        Attic/botan/noekeon.cpp Attic/botan/noekeon.h
        Attic/botan/rotate.h Attic/botan/xor_buf.h ancestry.cc
        cmd.cc cmd_conflicts.cc contrib/command/init.lua
        contrib/display_branches.lua contrib/dump-test-logs.sh
        git_change.cc git_change.hh git_export.cc git_export.hh
        lazy_rng.hh m4/library.m4 m4/mtn-gettext.m4 merge_3way.cc
        merge_conflict.cc migrate_ancestry.cc origin_type.hh
        roster_tests.hh tests/_--no-workspace/__driver__.lua
        tests/attr_mtn_execute/__driver__.lua
        tests/attr_set_drop/__driver__.lua
        tests/automate_file_merge/__driver__.lua
        tests/automate_get_workspace_root/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stdout
        tests/automate_lua/__driver__.lua
        tests/automate_lua/test.lua
        tests/automate_read_packets/__driver__.lua
        tests/checkout_in_windows_root/__driver__.lua
        tests/clobbered_attrs/__driver__.lua
        tests/commit_default_editor/__driver__.lua
        tests/commit_default_editor/test_hooks.lua
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/delta_directions/__driver__.lua
        tests/exchanging_work_via_netsync_sent_notes/__driver__.lua
        tests/exchanging_work_via_netsync_sent_notes/testnotes.test
        tests/exchanging_work_via_netsync_sent_notes/testnotes2.test
        tests/git_export/__driver__.lua
        tests/git_export_rename_loop/__driver__.lua
        tests/invalid__MTN_options/__driver__.lua
        tests/log_from_to_revision/__driver__.lua
        tests/ls_duplicates_with_duplicates/__driver__.lua
        tests/ls_duplicates_with_workspace/__driver__.lua
        tests/ls_duplicates_without_duplicates/__driver__.lua
        tests/m_selector/__driver__.lua
        tests/merge_into_workspace_mtn_execute/__driver__.lua
        tests/meta_selector_heads_of_certs/__driver__.lua
        tests/meta_selector_latest_common_ancestor/__driver__.lua
        tests/noop_merge_into_workspace/__driver__.lua
        tests/pluck_mtn_execute/__driver__.lua
        tests/resolve_conflicts_all_merge_commands/__driver__.lua
        tests/resolve_conflicts_all_resolutions/__driver__.lua
        tests/resolve_conflicts_all_resolutions/conflicts-1
        tests/resolve_conflicts_all_resolutions/conflicts-resolved
        tests/resolve_conflicts_all_resolutions/merge-1
        tests/resolve_conflicts_all_resolutions/merge3_hook.lua
        tests/resolve_conflicts_all_resolutions/show_first-checkout_left
        tests/resolve_conflicts_all_resolutions/show_first-checkout_right
        tests/resolve_conflicts_all_resolutions/show_first-interactive
        tests/resolve_conflicts_all_resolutions/show_first-thermostat
        tests/resolve_conflicts_all_resolutions/show_first-user
        tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
        tests/resolve_conflicts_all_resolutions/show_remaining-thermostat
        tests/resolve_conflicts_content/__driver__.lua
        tests/resolve_conflicts_content/conflicts-1
        tests/resolve_conflicts_content/conflicts-2
        tests/resolve_conflicts_content/merge-1
        tests/resolve_conflicts_content/update-1
        tests/resolve_conflicts_duplicate_name/conflicts-1
        tests/resolve_conflicts_duplicate_name/conflicts-resolved
        tests/resolve_conflicts_duplicate_name/merge-1
        tests/resolve_conflicts_errors/__driver__.lua
        tests/resolve_conflicts_errors/conflicts-attr-show-1
        tests/resolve_conflicts_errors/conflicts-attr-show-2
        tests/resolve_conflicts_errors/conflicts-attr-store-1
        tests/resolve_conflicts_errors/conflicts-attr-store-2
        tests/resolve_conflicts_errors/merge-old-conflicts-file
        tests/resolve_conflicts_multiple_names/__driver__.lua
        tests/resolve_conflicts_none/__driver__.lua
        tests/resolve_conflicts_none/conflicts-1
        tests/resolve_conflicts_none/merge-1
        tests/resolve_conflicts_none/update-1
        tests/resolve_conflicts_propagate/__driver__.lua
        tests/resolve_conflicts_propagate/conflicts-1
        tests/resolve_conflicts_propagate/conflicts-2
        tests/resolve_conflicts_propagate/conflicts-resolved
        tests/resolve_conflicts_propagate/propagate-1
        tests/resolve_conflicts_propagate/propagate-2
        tests/resolve_conflicts_read_all/__driver__.lua
        tests/resolve_conflicts_read_all/attribute-attached_left
        tests/resolve_conflicts_read_all/attribute-attached_right
        tests/resolve_conflicts_read_all/attribute-detached_left
        tests/resolve_conflicts_read_all/attribute-detached_right
        tests/resolve_conflicts_read_all/content-attached_left
        tests/resolve_conflicts_read_all/content-attached_right
        tests/resolve_conflicts_read_all/content-detached_left
        tests/resolve_conflicts_read_all/content-detached_right
        tests/resolve_conflicts_read_all/directory-loop_left
        tests/resolve_conflicts_read_all/directory-loop_right
        tests/resolve_conflicts_read_all/duplicate-add-rename_left
        tests/resolve_conflicts_read_all/duplicate-add-rename_right
        tests/resolve_conflicts_read_all/duplicate-adds_left
        tests/resolve_conflicts_read_all/duplicate-adds_right
        
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_left
        
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_right
        tests/resolve_conflicts_read_all/duplicate-renames_left
        tests/resolve_conflicts_read_all/duplicate-renames_right
        tests/resolve_conflicts_read_all/invalid-add_left
        tests/resolve_conflicts_read_all/invalid-add_right
        tests/resolve_conflicts_read_all/invalid-rename_left
        tests/resolve_conflicts_read_all/invalid-rename_right
        tests/resolve_conflicts_read_all/missing-root_left
        tests/resolve_conflicts_read_all/missing-root_right
        tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_left
        tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_right
        tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_left
        tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_right
        tests/resolve_conflicts_read_all/multiple-name-plus-orphan_left
        tests/resolve_conflicts_read_all/multiple-name-plus-orphan_right
        tests/resolve_conflicts_read_all/multiple-names_left
        tests/resolve_conflicts_read_all/multiple-names_right
        tests/resolve_conflicts_read_all/orphaned-add_left
        tests/resolve_conflicts_read_all/orphaned-add_right
        tests/resolve_conflicts_read_all/orphaned-rename_left
        tests/resolve_conflicts_read_all/orphaned-rename_right
        tests/resolve_conflicts_read_all/unrelated-projects_left
        tests/resolve_conflicts_read_all/unrelated-projects_right
        tests/revert_attrs/__driver__.lua
        tests/u_selector/__driver__.lua unit-tests/basic_io.cc
        unit-tests/charset.cc unit-tests/commands.cc
        unit-tests/cset.cc unit-tests/dates.cc
        unit-tests/git_change.cc unit-tests/globish.cc
        unit-tests/graph.cc unit-tests/merge_3way.cc
        unit-tests/merge_roster.cc unit-tests/mkstemp.cc
        unit-tests/netcmd.cc unit-tests/netxx_pipe.cc
        unit-tests/option.cc unit-tests/outdated_indicator.cc
        unit-tests/packet.cc unit-tests/paths.cc
        unit-tests/refiner.cc unit-tests/restrictions.cc
        unit-tests/rev_height.cc unit-tests/revision.cc
        unit-tests/roster.cc unit-tests/simplestring_xform.cc
        unit-tests/transforms.cc unit-tests/uri.cc
        unit-tests/vocab.cc unit-tests/xdelta.cc
        unix/tester-check-net.cc win32/tester-check-net.cc
Added directories:
        Attic tests/_--no-workspace tests/attr_mtn_execute
        tests/attr_set_drop tests/automate_file_merge
        tests/automate_get_workspace_root tests/automate_lua
        tests/automate_read_packets tests/checkout_in_windows_root
        tests/clobbered_attrs tests/commit_default_editor
        tests/default_command_options tests/delta_directions
        tests/exchanging_work_via_netsync_sent_notes
        tests/git_export tests/git_export_rename_loop
        tests/invalid__MTN_options tests/log_from_to_revision
        tests/ls_duplicates_with_duplicates
        tests/ls_duplicates_with_workspace
        tests/ls_duplicates_without_duplicates tests/m_selector
        tests/merge_into_workspace_mtn_execute
        tests/meta_selector_heads_of_certs
        tests/meta_selector_latest_common_ancestor
        tests/noop_merge_into_workspace tests/pluck_mtn_execute
        tests/resolve_conflicts_all_merge_commands
        tests/resolve_conflicts_all_resolutions
        tests/resolve_conflicts_content
        tests/resolve_conflicts_errors
        tests/resolve_conflicts_multiple_names
        tests/resolve_conflicts_none
        tests/resolve_conflicts_propagate
        tests/resolve_conflicts_read_all tests/revert_attrs
        tests/u_selector unit-tests
Modified files:
        .mtn-ignore AUTHORS Attic/botan/README.botan-monotone
        Attic/botan/aes.cpp Attic/botan/aes.h
        Attic/botan/aes_tab.cpp Attic/botan/alg_id.cpp
        Attic/botan/alg_id.h Attic/botan/allocate.h
        Attic/botan/arc4.cpp Attic/botan/arc4.h
        Attic/botan/asn1_alt.cpp Attic/botan/asn1_att.cpp
        Attic/botan/asn1_dn.cpp Attic/botan/asn1_int.cpp
        Attic/botan/asn1_int.h Attic/botan/asn1_ku.cpp
        Attic/botan/asn1_obj.h Attic/botan/asn1_oid.cpp
        Attic/botan/asn1_oid.h Attic/botan/asn1_str.cpp
        Attic/botan/asn1_tm.cpp Attic/botan/base.cpp
        Attic/botan/base.h Attic/botan/base64.cpp
        Attic/botan/base64.h Attic/botan/basefilt.cpp
        Attic/botan/basefilt.h Attic/botan/ber_dec.cpp
        Attic/botan/ber_dec.h Attic/botan/big_code.cpp
        Attic/botan/big_io.cpp Attic/botan/big_ops2.cpp
        Attic/botan/big_ops3.cpp Attic/botan/big_rand.cpp
        Attic/botan/bigint.cpp Attic/botan/bigint.h
        Attic/botan/bit_ops.h Attic/botan/blinding.cpp
        Attic/botan/blinding.h Attic/botan/botan.h
        Attic/botan/buf_es.cpp Attic/botan/buf_es.h
        Attic/botan/buf_filt.cpp Attic/botan/buf_filt.h
        Attic/botan/build.h Attic/botan/cbc.cpp Attic/botan/cbc.h
        Attic/botan/cbc_mac.cpp Attic/botan/cbc_mac.h
        Attic/botan/certstor.cpp Attic/botan/certstor.h
        Attic/botan/cfb.cpp Attic/botan/cfb.h
        Attic/botan/charset.cpp Attic/botan/charset.h
        Attic/botan/crc32.cpp Attic/botan/crc32.h
        Attic/botan/credits.txt Attic/botan/crl_ent.cpp
        Attic/botan/crl_ent.h Attic/botan/ctr.cpp Attic/botan/ctr.h
        Attic/botan/cts.cpp Attic/botan/cts.h
        Attic/botan/data_snk.cpp Attic/botan/data_snk.h
        Attic/botan/data_src.cpp Attic/botan/data_src.h
        Attic/botan/datastor.cpp Attic/botan/datastor.h
        Attic/botan/def_alg.cpp Attic/botan/def_mode.cpp
        Attic/botan/def_ops.cpp Attic/botan/def_powm.cpp
        Attic/botan/def_powm.h Attic/botan/defalloc.cpp
        Attic/botan/defalloc.h Attic/botan/der_enc.cpp
        Attic/botan/der_enc.h Attic/botan/des.cpp Attic/botan/des.h
        Attic/botan/des_tab.cpp Attic/botan/dh.cpp Attic/botan/dh.h
        Attic/botan/divide.cpp Attic/botan/dl_algo.cpp
        Attic/botan/dl_algo.h Attic/botan/dl_group.cpp
        Attic/botan/dl_group.h Attic/botan/dlies.cpp
        Attic/botan/dlies.h Attic/botan/dsa_gen.cpp
        Attic/botan/eax.cpp Attic/botan/eax.h Attic/botan/ecb.cpp
        Attic/botan/ecb.h Attic/botan/eme.h Attic/botan/eme1.cpp
        Attic/botan/eme_pkcs.cpp Attic/botan/emsa.h
        Attic/botan/emsa1.cpp Attic/botan/emsa2.cpp
        Attic/botan/emsa3.cpp Attic/botan/emsa4.cpp
        Attic/botan/emsa_raw.cpp Attic/botan/eng_base.cpp
        Attic/botan/eng_def.h Attic/botan/engine.cpp
        Attic/botan/engine.h Attic/botan/enums.h
        Attic/botan/es_capi.cpp Attic/botan/es_capi.h
        Attic/botan/es_dev.cpp Attic/botan/es_dev.h
        Attic/botan/es_egd.cpp Attic/botan/es_egd.h
        Attic/botan/es_win32.cpp Attic/botan/es_win32.h
        Attic/botan/exceptn.cpp Attic/botan/exceptn.h
        Attic/botan/filter.cpp Attic/botan/filter.h
        Attic/botan/filters.cpp Attic/botan/filters.h
        Attic/botan/get_algo.cpp Attic/botan/get_enc.cpp
        Attic/botan/get_pbe.cpp Attic/botan/hash_id.cpp
        Attic/botan/hash_id.h Attic/botan/hex.cpp Attic/botan/hex.h
        Attic/botan/hmac.cpp Attic/botan/hmac.h
        Attic/botan/if_algo.cpp Attic/botan/if_algo.h
        Attic/botan/info.txt Attic/botan/init.h
        Attic/botan/init_def.cpp Attic/botan/init_opt.cpp
        Attic/botan/jacobi.cpp Attic/botan/kdf.cpp Attic/botan/kdf.h
        Attic/botan/keypair.cpp Attic/botan/keypair.h
        Attic/botan/libstate.cpp Attic/botan/libstate.h
        Attic/botan/license.txt Attic/botan/loadstor.h
        Attic/botan/look_add.h Attic/botan/look_pk.cpp
        Attic/botan/look_pk.h Attic/botan/lookup.h
        Attic/botan/make_prm.cpp Attic/botan/mdx_hash.cpp
        Attic/botan/mdx_hash.h Attic/botan/mem_ops.h
        Attic/botan/mem_pool.cpp Attic/botan/mem_pool.h
        Attic/botan/mgf1.cpp Attic/botan/mgf1.h
        Attic/botan/mlock.cpp Attic/botan/mode_pad.cpp
        Attic/botan/mode_pad.h Attic/botan/modebase.cpp
        Attic/botan/modebase.h Attic/botan/modules.cpp
        Attic/botan/modules.h Attic/botan/mp_asm.cpp
        Attic/botan/mp_asm.h Attic/botan/mp_asmi.h
        Attic/botan/mp_comba.cpp Attic/botan/mp_core.h
        Attic/botan/mp_karat.cpp Attic/botan/mp_misc.cpp
        Attic/botan/mp_mulop.cpp Attic/botan/mp_numth.cpp
        Attic/botan/mp_shift.cpp Attic/botan/mp_types.h
        Attic/botan/mutex.cpp Attic/botan/mutex.h
        Attic/botan/numthry.cpp Attic/botan/numthry.h
        Attic/botan/ofb.cpp Attic/botan/ofb.h Attic/botan/oids.cpp
        Attic/botan/oids.h Attic/botan/out_buf.cpp
        Attic/botan/out_buf.h Attic/botan/parsing.cpp
        Attic/botan/parsing.h Attic/botan/pbe.h
        Attic/botan/pbe_pkcs.h Attic/botan/pbes1.cpp
        Attic/botan/pbes2.cpp Attic/botan/pem.cpp Attic/botan/pem.h
        Attic/botan/pipe.cpp Attic/botan/pipe.h
        Attic/botan/pipe_io.cpp Attic/botan/pipe_rw.cpp
        Attic/botan/pk_algs.cpp Attic/botan/pk_algs.h
        Attic/botan/pk_core.cpp Attic/botan/pk_core.h
        Attic/botan/pk_keys.cpp Attic/botan/pk_keys.h
        Attic/botan/pk_ops.h Attic/botan/pk_util.cpp
        Attic/botan/pk_util.h Attic/botan/pkcs10.cpp
        Attic/botan/pkcs10.h Attic/botan/pkcs5.cpp
        Attic/botan/pkcs5.h Attic/botan/pkcs8.cpp
        Attic/botan/pkcs8.h Attic/botan/policy.cpp
        Attic/botan/pow_mod.cpp Attic/botan/pow_mod.h
        Attic/botan/powm_fw.cpp Attic/botan/powm_mnt.cpp
        Attic/botan/prf_x942.cpp Attic/botan/primes.cpp
        Attic/botan/pubkey.cpp Attic/botan/pubkey.h
        Attic/botan/randpool.cpp Attic/botan/randpool.h
        Attic/botan/reducer.cpp Attic/botan/reducer.h
        Attic/botan/rng.cpp Attic/botan/rng.h Attic/botan/rsa.cpp
        Attic/botan/rsa.h Attic/botan/s2k.cpp Attic/botan/s2k.h
        Attic/botan/secmem.h Attic/botan/secqueue.cpp
        Attic/botan/secqueue.h Attic/botan/selftest.cpp
        Attic/botan/selftest.h Attic/botan/sha160.cpp
        Attic/botan/sha160.h Attic/botan/sha256.cpp
        Attic/botan/sha256.h Attic/botan/stl_util.h
        Attic/botan/symkey.cpp Attic/botan/symkey.h
        Attic/botan/thanks.txt Attic/botan/timers.cpp
        Attic/botan/timers.h Attic/botan/types.h Attic/botan/ui.cpp
        Attic/botan/ui.h Attic/botan/util.cpp Attic/botan/util.h
        Attic/botan/version.h Attic/botan/x509_ca.cpp
        Attic/botan/x509_ca.h Attic/botan/x509_crl.cpp
        Attic/botan/x509_crl.h Attic/botan/x509_ext.cpp
        Attic/botan/x509_ext.h Attic/botan/x509_key.cpp
        Attic/botan/x509_key.h Attic/botan/x509_obj.cpp
        Attic/botan/x509_obj.h Attic/botan/x509cert.cpp
        Attic/botan/x509cert.h Attic/botan/x509find.cpp
        Attic/botan/x509find.h Attic/botan/x509opt.cpp
        Attic/botan/x509self.cpp Attic/botan/x509self.h
        Attic/botan/x509stor.cpp Attic/botan/x509stor.h
        Attic/botan/x931_rng.cpp Attic/botan/x931_rng.h
        Attic/lua/luaconf.h Attic/sha1_engine.hh HACKING INSTALL
        Makefile.am NEWS README UPGRADE adler32.hh annotate.cc
        annotate.hh app_state.cc app_state.hh asciik.cc asciik.hh
        audit-includes automate.cc base.hh basic_io.cc basic_io.hh
        botan_pipe_cache.hh cert.cc cert.hh char_classifiers.hh
        charset.cc charset.hh cleanup.hh cmd.hh cmd_automate.cc
        cmd_db.cc cmd_diff_log.cc cmd_files.cc cmd_key_cert.cc
        cmd_list.cc cmd_merging.cc cmd_netsync.cc cmd_othervcs.cc
        cmd_packet.cc cmd_ws_commit.cc commands.cc commands.hh
        configure.ac constants.hh contrib/ciabot_monotone.py
        contrib/monotone-inotify.lua cset.cc cset.hh
        current_exception.hh cycle_detector.hh database.cc
        database.hh database_check.cc dates.cc dates.hh
        diff_output.cc diff_output.hh do-editor-vars.sh
        enumerator.cc enumerator.hh epoch.cc epoch.hh
        examples/display_branches.lua file_io.cc file_io.hh
        gettext.h globish.cc globish.hh graph.cc graph.hh gzip.cc
        gzip.hh hash_map.hh hmac.cc hmac.hh hybrid_map.hh
        inodeprint.cc inodeprint.hh interner.hh key_store.cc
        key_store.hh keys.cc keys.hh lcs.cc lcs.hh legacy.cc
        legacy.hh lexical_cast.hh lru_writeback_cache.hh
        lua-testsuite.lua lua.cc lua.hh lua_hooks.cc lua_hooks.hh
        luaext_globish.cc luaext_guess_binary.cc luaext_mkstemp.cc
        luaext_parse_basic_io.cc luaext_platform.cc m4/boost.m4
        m4/inaddrnone.m4 m4/netxx.m4 m4/numeric_vocab.m4 m4/pkg.m4
        m4/stlporthashmap.m4 m4/syncwithstdio.m4 m4/tempstatconst.m4
        m4/typeof.m4 merge_content.cc merge_content.hh
        merge_roster.cc merge_roster.hh merkle_tree.cc
        merkle_tree.hh migrate_schema.cc migrate_work.cc
        migration.hh mkstemp.cc monotone.cc monotone.spec
        monotone.texi mt_version.cc mt_version.hh mtn-sanity.cc
        mtn-sanity.hh netcmd.cc netcmd.hh netio.hh netsync.cc
        netxx/socket.cxx netxx_pipe.cc netxx_pipe.hh
        notes/release-checklist.txt numeric_vocab.hh option.cc
        option.hh options.cc options.hh options_list.hh
        outdated_indicator.cc outdated_indicator.hh packet.cc
        packet.hh parallel_iter.hh paths.cc paths.hh pch.hh
        pcrewrap.cc pcrewrap.hh platform-wrapped.hh platform.hh
        po/LINGUAS po/Makevars po/README po/de.po po/es.po po/fr.po
        po/it.po po/sv.po project.cc project.hh quick_alloc.hh
        randomfile.hh randomizer.cc randomizer.hh rcs_file.cc
        rcs_file.hh rcs_import.cc rcs_import.hh refiner.cc
        refiner.hh restrictions.cc restrictions.hh rev_height.cc
        rev_height.hh rev_types.hh revision.cc revision.hh roster.cc
        roster.hh roster_delta.cc roster_delta.hh safe_map.hh
        sanity.cc sanity.hh schema.sql selectors.cc selectors.hh
        sha1.cc simplestring_xform.cc simplestring_xform.hh
        ssh_agent.cc ssh_agent.hh std_hooks.lua string_queue.hh
        tester-plaf.hh tester-tests/cleanup-1/__driver__.lua
        tester-tests/cleanup-2/__driver__.lua
        tester-tests/isolated-1/__driver__.lua
        tester-tests/isolated-2/__driver__.lua
        tester-tests/remove-unwriteable/__driver__.lua
        tester-testsuite.lua tester.cc testlib.lua
        tests/attr_set_get_commands/__driver__.lua
        tests/automate_content_diff/__driver__.lua
        tests/automate_get_current_revision/__driver__.lua
        tests/automate_identify/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/automate_inventory_ignore_dirs/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/local_hooks.lua
        tests/automate_inventory_restricted/__driver__.lua
        tests/automate_show_conflicts/__driver__.lua
        tests/automate_show_conflicts/expected-attribute-attached.stdout
        tests/automate_show_conflicts/expected-attribute-detached.stdout
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/automate_show_conflicts/expected-content-detached.stdout
        tests/automate_show_conflicts/expected-directory-loop.stdout
        tests/automate_show_conflicts/expected-duplicate-add-rename.stdout
        tests/automate_show_conflicts/expected-duplicate-adds.stdout
        
tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout
        tests/automate_show_conflicts/expected-duplicate-renames.stdout
        tests/automate_show_conflicts/expected-invalid-add.stdout
        tests/automate_show_conflicts/expected-invalid-rename.stdout
        tests/automate_show_conflicts/expected-missing-root.stdout
        
tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout
        
tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout
        tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout
        tests/automate_show_conflicts/expected-multiple-names.stdout
        tests/automate_show_conflicts/expected-orphaned-add.stdout
        tests/automate_show_conflicts/expected-orphaned-rename.stdout
        tests/automate_show_conflicts/expected-unrelated-projects.stdout
        tests/automate_stdio/__driver__.lua
        tests/commit_validation_lua_hook/__driver__.lua
        tests/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua
        tests/db_data_format_checking/__driver__.lua
        tests/defecting_attributes/__driver__.lua
        tests/dump_on_crash/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/empty_string_as_a_path_name/__driver__.lua
        tests/fail_cleanly_on_unreadable_db/__driver__.lua
        tests/inventory_hooks.lua
        tests/log_--last=N_--next=N/__driver__.lua
        tests/log_--last=N_FILENAME/__driver__.lua
        tests/log_dir/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
        tests/min_hooks.lua
        tests/netsync_hook_errcodes/__driver__.lua
        tests/netsync_permissions/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/p_selector/__driver__.lua
        tests/pid_file_and_log_handles_open_failures/__driver__.lua
        tests/resolve_conflicts_duplicate_name/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        tests/ssh_agent/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/mtn-ignore
        tests/test_hooks.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/two_parent_workspace_list/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc
        tests/util_mtnopt/__driver__.lua transforms.cc transforms.hh
        txt2c.cc ui.cc ui.hh unit-tests/numeric_vocab.cc
        unit-tests/sha1.cc unit-tests/string_queue.cc
        unit-testsuite.lua unit_tester.cc unit_tests.hh
        unix/cputime.cc unix/fs.cc unix/get_system_flavour.cc
        unix/inodeprint.cc unix/main.cc unix/make_io_binary.cc
        unix/os_strerror.cc unix/process.cc unix/read_password.cc
        unix/ssh_agent_platform.cc unix/ssh_agent_platform.hh
        unix/terminal.cc unix/tester-plaf.cc update.cc update.hh
        uri.cc uri.hh util/mtnopt.in vector.hh visualc/config.h
        vocab.cc vocab.hh vocab_cast.hh vocab_hash.hh
        vocab_macros.hh vocab_terms.hh win32/README win32/cputime.cc
        win32/fs.cc win32/get_system_flavour.cc win32/inodeprint.cc
        win32/main.cc win32/make_io_binary.cc win32/monotone.iss
        win32/os_strerror.cc win32/process.cc win32/read_password.cc
        win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
        win32/terminal.cc win32/tester-plaf.cc work.cc work.hh
        xdelta.cc xdelta.hh
Modified attrs:
        tests/resolve_conflicts_errors/__driver__.lua
        tests/resolve_conflicts_errors/conflicts-attr-store-1
        util/mtnopt.in

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
11f015f795c53851dcfb69946bb3fb2fe0109981)
            to branch 'net.venge.monotone.experiment.meta-selector' (head 
b6fc89d5d26677e8db8e84f4fd42a035613f5ede)


monotone --db={your.database} diff 
--revision=11f015f795c53851dcfb69946bb3fb2fe0109981 
--revision=b71efabd52c073e0bcacb66bb7895c8c6ea198f1
monotone --db={your.database} diff 
--revision=b6fc89d5d26677e8db8e84f4fd42a035613f5ede 
--revision=b71efabd52c073e0bcacb66bb7895c8c6ea198f1
----------------------------------------------------------------------