[Monotone-commits-diffs] Revision 14940b8edd32ecdce27b012f7e9b9528298aa324

[monotone]

-----------------------------------------------------------------
Revision: 14940b8edd32ecdce27b012f7e9b9528298aa324
Ancestor: 080ee093eb6d7c90888796128f50957659e79361
Ancestor: 37b852e882b92978ee0ff0025f0ca642baf07d7c
Author: address@hidden
Date: 2009-01-18T21:50:49
Branch: net.venge.monotone.commit_without_-b

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 smap.hh
        tests/syntax_errors_in_.mtn-ignore/stderr-ref
        tests/syntax_errors_in_.mtn-ignore/stdout-ref
Renamed entries:
        botan/big_base.cpp to botan/bigint.cpp
        botan/fips140.cpp to botan/selftest.cpp
        botan/fips140.h to botan/selftest.h
        botan/mp_mul.cpp to botan/mp_karat.cpp
        contrib/mtnopt to util/mtnopt.in
        tests/clone_-b_no_dir to tests/clone_branch_no_dir
Added files:
        botan/bswap.h botan/mp_monty.cpp botan/noekeon.cpp
        botan/noekeon.h botan/rotate.h botan/xor_buf.h
        cmd_conflicts.cc contrib/command/init.lua
        contrib/display_branches.lua contrib/dump-test-logs.sh
        contrib/monotone-inotify.lua
        tests/_--no-workspace/__driver__.lua
        tests/attr_mtn_execute/__driver__.lua
        tests/automate_file_merge/__driver__.lua
        tests/automate_get_options/__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/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_show_conflicts_defaults/__driver__.lua
        tests/branch/__driver__.lua
        tests/checkout_in_windows_root/__driver__.lua
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.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/invalid__MTN_options/__driver__.lua
        tests/ls_duplicates_with_duplicates/__driver__.lua
        tests/ls_duplicates_with_workspace/__driver__.lua
        tests/ls_duplicates_without_duplicates/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
        tests/noop_merge_into_workspace/__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/__driver__.lua
        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/util_mtnopt/__driver__.lua unix/tester-check-net.c
        win32/tester-check-net.c
Added directories:
        tests/_--no-workspace tests/attr_mtn_execute
        tests/automate_file_merge tests/automate_get_options
        tests/automate_get_workspace_root tests/automate_lua
        tests/automate_read_packets tests/automate_show_conflicts
        tests/automate_show_conflicts_defaults tests/branch
        tests/checkout_in_windows_root tests/default_command_options
        tests/exchanging_work_via_netsync_sent_notes
        tests/invalid__MTN_options
        tests/ls_duplicates_with_duplicates
        tests/ls_duplicates_with_workspace
        tests/ls_duplicates_without_duplicates
        tests/noop_merge_into_workspace
        tests/resolve_conflicts_all_merge_commands
        tests/resolve_conflicts_all_resolutions
        tests/resolve_conflicts_content
        tests/resolve_conflicts_duplicate_name
        tests/resolve_conflicts_errors
        tests/resolve_conflicts_multiple_names
        tests/resolve_conflicts_none
        tests/resolve_conflicts_propagate
        tests/resolve_conflicts_read_all tests/util_mtnopt util
Modified files:
        .mtn-ignore AUTHORS HACKING INSTALL Makefile.am NEWS README
        UPGRADE app_state.cc app_state.hh asciik.cc automate.cc
        basic_io.cc basic_io.hh botan/README.botan-monotone
        botan/aes.cpp botan/aes.h botan/aes_tab.cpp botan/alg_id.cpp
        botan/alg_id.h botan/allocate.h botan/arc4.cpp botan/arc4.h
        botan/asn1_alt.cpp botan/asn1_att.cpp botan/asn1_dn.cpp
        botan/asn1_int.cpp botan/asn1_int.h botan/asn1_ku.cpp
        botan/asn1_obj.h botan/asn1_oid.cpp botan/asn1_oid.h
        botan/asn1_str.cpp botan/asn1_tm.cpp botan/base.cpp
        botan/base.h botan/base64.cpp botan/base64.h
        botan/basefilt.cpp botan/basefilt.h botan/ber_dec.cpp
        botan/ber_dec.h botan/big_code.cpp botan/big_io.cpp
        botan/big_ops2.cpp botan/big_ops3.cpp botan/big_rand.cpp
        botan/bigint.cpp botan/bigint.h botan/bit_ops.h
        botan/blinding.cpp botan/blinding.h botan/botan.h
        botan/buf_es.cpp botan/buf_es.h botan/buf_filt.cpp
        botan/buf_filt.h botan/build.h botan/cbc.cpp botan/cbc.h
        botan/cbc_mac.cpp botan/cbc_mac.h botan/certstor.cpp
        botan/certstor.h botan/cfb.cpp botan/cfb.h botan/charset.cpp
        botan/charset.h botan/crc32.cpp botan/crc32.h
        botan/credits.txt botan/crl_ent.cpp botan/crl_ent.h
        botan/ctr.cpp botan/ctr.h botan/cts.cpp botan/cts.h
        botan/data_snk.cpp botan/data_snk.h botan/data_src.cpp
        botan/data_src.h botan/datastor.cpp botan/datastor.h
        botan/def_alg.cpp botan/def_mode.cpp botan/def_ops.cpp
        botan/def_powm.cpp botan/def_powm.h botan/defalloc.cpp
        botan/defalloc.h botan/der_enc.cpp botan/der_enc.h
        botan/des.cpp botan/des.h botan/des_tab.cpp botan/dh.cpp
        botan/dh.h botan/divide.cpp botan/dl_algo.cpp
        botan/dl_algo.h botan/dl_group.cpp botan/dl_group.h
        botan/dlies.cpp botan/dlies.h botan/dsa_gen.cpp
        botan/eax.cpp botan/eax.h botan/ecb.cpp botan/ecb.h
        botan/eme.h botan/eme1.cpp botan/eme_pkcs.cpp botan/emsa.h
        botan/emsa1.cpp botan/emsa2.cpp botan/emsa3.cpp
        botan/emsa4.cpp botan/emsa_raw.cpp botan/eng_base.cpp
        botan/eng_def.h botan/engine.cpp botan/engine.h
        botan/enums.h botan/es_capi.cpp botan/es_capi.h
        botan/es_dev.cpp botan/es_dev.h botan/es_egd.cpp
        botan/es_egd.h botan/es_win32.cpp botan/es_win32.h
        botan/exceptn.cpp botan/exceptn.h botan/filter.cpp
        botan/filter.h botan/filters.cpp botan/filters.h
        botan/get_algo.cpp botan/get_enc.cpp botan/get_pbe.cpp
        botan/hash_id.cpp botan/hash_id.h botan/hex.cpp botan/hex.h
        botan/hmac.cpp botan/hmac.h botan/if_algo.cpp
        botan/if_algo.h botan/info.txt botan/init.h
        botan/init_def.cpp botan/init_opt.cpp botan/jacobi.cpp
        botan/kdf.cpp botan/kdf.h botan/keypair.cpp botan/keypair.h
        botan/libstate.cpp botan/libstate.h botan/license.txt
        botan/loadstor.h botan/look_add.h botan/look_pk.cpp
        botan/look_pk.h botan/lookup.h botan/make_prm.cpp
        botan/mdx_hash.cpp botan/mdx_hash.h botan/mem_ops.h
        botan/mem_pool.cpp botan/mem_pool.h botan/mgf1.cpp
        botan/mgf1.h botan/mlock.cpp botan/mode_pad.cpp
        botan/mode_pad.h botan/modebase.cpp botan/modebase.h
        botan/modules.cpp botan/modules.h botan/mp_asm.cpp
        botan/mp_asm.h botan/mp_asmi.h botan/mp_comba.cpp
        botan/mp_core.h botan/mp_karat.cpp botan/mp_misc.cpp
        botan/mp_mulop.cpp botan/mp_numth.cpp botan/mp_shift.cpp
        botan/mp_types.h botan/mutex.cpp botan/mutex.h
        botan/numthry.cpp botan/numthry.h botan/ofb.cpp botan/ofb.h
        botan/oids.cpp botan/oids.h botan/out_buf.cpp
        botan/out_buf.h botan/parsing.cpp botan/parsing.h
        botan/pbe.h botan/pbe_pkcs.h botan/pbes1.cpp botan/pbes2.cpp
        botan/pem.cpp botan/pem.h botan/pipe.cpp botan/pipe.h
        botan/pipe_io.cpp botan/pipe_rw.cpp botan/pk_algs.cpp
        botan/pk_algs.h botan/pk_core.cpp botan/pk_core.h
        botan/pk_keys.cpp botan/pk_keys.h botan/pk_ops.h
        botan/pk_util.cpp botan/pk_util.h botan/pkcs10.cpp
        botan/pkcs10.h botan/pkcs5.cpp botan/pkcs5.h botan/pkcs8.cpp
        botan/pkcs8.h botan/policy.cpp botan/pow_mod.cpp
        botan/pow_mod.h botan/powm_fw.cpp botan/powm_mnt.cpp
        botan/prf_x942.cpp botan/primes.cpp botan/pubkey.cpp
        botan/pubkey.h botan/randpool.cpp botan/randpool.h
        botan/reducer.cpp botan/reducer.h botan/rng.cpp botan/rng.h
        botan/rsa.cpp botan/rsa.h botan/s2k.cpp botan/s2k.h
        botan/secmem.h botan/secqueue.cpp botan/secqueue.h
        botan/selftest.cpp botan/selftest.h botan/sha160.cpp
        botan/sha160.h botan/sha256.cpp botan/sha256.h
        botan/stl_util.h botan/symkey.cpp botan/symkey.h
        botan/thanks.txt botan/timers.cpp botan/timers.h
        botan/types.h botan/ui.cpp botan/ui.h botan/util.cpp
        botan/util.h botan/version.h botan/x509_ca.cpp
        botan/x509_ca.h botan/x509_crl.cpp botan/x509_crl.h
        botan/x509_ext.cpp botan/x509_ext.h botan/x509_key.cpp
        botan/x509_key.h botan/x509_obj.cpp botan/x509_obj.h
        botan/x509cert.cpp botan/x509cert.h botan/x509find.cpp
        botan/x509find.h botan/x509opt.cpp botan/x509self.cpp
        botan/x509self.h botan/x509stor.cpp botan/x509stor.h
        botan/x931_rng.cpp botan/x931_rng.h cert.cc cert.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_packet.cc cmd_ws_commit.cc commands.cc configure.ac
        contrib/ciabot_monotone.py contrib/monotone.bash_completion
        database.cc database.hh dates.cc dates.hh diff_patch.cc
        diff_patch.hh examples/display_branches.lua gettext.h
        globish.cc globish.hh gzip.cc gzip.hh key_store.cc
        key_store.hh keys.cc lru_writeback_cache.hh lua/luaconf.h
        lua-testsuite.lua lua.cc lua.hh lua_hooks.cc lua_hooks.hh
        luaext_parse_basic_io.cc merge.cc merge.hh merkle_tree.cc
        mkstemp.cc monotone.cc monotone.spec monotone.texi
        mt_version.cc netcmd.cc netio.hh netsync.cc netxx/socket.cxx
        notes/release-checklist.txt options_list.hh packet.cc
        paths.cc paths.hh po/LINGUAS po/POTFILES.in po/de.po
        po/es.po po/fr.po po/it.po po/sv.po randomfile.hh
        rcs_import.cc refiner.cc rev_height.hh rev_types.hh
        revision.cc revision.hh roster.cc roster.hh roster_merge.cc
        roster_merge.hh sanity.hh schema_migration.cc selectors.cc
        simplestring_xform.cc std_hooks.lua string_queue.cc
        tester.cc testlib.lua
        tests/(imp)_deleting_directories/__driver__.lua
        tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua
        tests/_--author,_--date/__driver__.lua
        tests/_--rcfile=-/__driver__.lua
        tests/automate_cert/__driver__.lua
        tests/automate_certs/__driver__.lua
        tests/automate_content_diff/__driver__.lua
        tests/automate_get_content_changed/__driver__.lua
        tests/automate_get_corresponding_path/__driver__.lua
        tests/automate_get_current_revision/__driver__.lua
        tests/automate_get_file,_automate_get_file_of/__driver__.lua
        tests/automate_get_manifest_of/__driver__.lua
        tests/automate_get_revision/__driver__.lua
        tests/automate_heads/__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_options/__driver__.lua
        tests/automate_inventory_options/expected-no-ignored.stdout
        tests/automate_inventory_options/expected-no-unchanged.stdout
        tests/automate_inventory_options/expected-no-unknown.stdout
        tests/automate_inventory_options/expected-none.stdout
        tests/automate_inventory_options/expected-renames-both.stdout
        
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
        
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
        tests/automate_inventory_options/expected-renames-target.stdout
        tests/automate_inventory_restricted/__driver__.lua
        tests/automate_keys/__driver__.lua
        tests/automate_stdio/__driver__.lua
        tests/b_t_and_a_selector_globbing/__driver__.lua
        tests/can_execute_things/__driver__.lua
        tests/check_--log/__driver__.lua
        tests/check_later_and_earlier_selectors/__driver__.lua
        tests/checkout_creates__MTN_log/__driver__.lua
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_branch_no_dir/__driver__.lua
        tests/clone_creates__MTN_log/__driver__.lua
        tests/clone_creates_right__MTN_options/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/commit_update_multiple_heads_message/__driver__.lua
        tests/commit_using__MTN_log/__driver__.lua
        tests/commit_validation_lua_hook/__driver__.lua
        tests/commit_with_--message-file/__driver__.lua
        tests/commit_writes_message_back_to__MTN_log/__driver__.lua
        tests/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua
        tests/common/test_utils_inventory.lua
        tests/conflict_messages/__driver__.lua
        tests/db_data_format_checking/__driver__.lua
        tests/disallowing_persistence_of_passphrase/__driver__.lua
        tests/do_not_log_the_result_of_hook_get_passphrase/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/empty_string_as_a_path_name/__driver__.lua
        tests/listing_workspace_manifests/__driver__.lua
        tests/log_--brief/__driver__.lua
        tests/log_and_selectors_returning_multiple_rids/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        tests/netsync_epochs_are_not_sent_upstream_by_pull/__driver__.lua
        tests/netsync_hook_errcodes/__driver__.lua
        tests/netsync_permissions/__driver__.lua
        tests/netsync_server_absorbs_and_checks_epochs/__driver__.lua
        tests/netsync_transfers_public_keys/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/normalized_filenames/__driver__.lua
        tests/persistence_of_passphrase/__driver__.lua
        tests/persistent_netsync_server_-_keys/__driver__.lua
        tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua
        tests/pid_file_and_log_handles_open_failures/__driver__.lua
        tests/read_and_convert_old_privkey_packet/__driver__.lua
        tests/renaming_and_editing_a_file/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        tests/short_options_work_correctly/__driver__.lua
        tests/sticky_branches/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/mtn-ignore
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/two_parent_workspace_list/__driver__.lua
        tests/update_does_not_stomp_non-monotone_files/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc transforms.cc transforms.hh
        ui.cc util/mtnopt.in visualc/config.h vocab.cc vocab.hh
        vocab_macros.hh win32/README win32/fs.cc win32/monotone.iss
        work.cc xdelta.cc
Modified attrs:
        tests/resolve_conflicts_errors/__driver__.lua
        tests/resolve_conflicts_errors/conflicts-attr-store-1

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
080ee093eb6d7c90888796128f50957659e79361)
            to branch 'net.venge.monotone.commit_without_-b' (head 
37b852e882b92978ee0ff0025f0ca642baf07d7c)


monotone --db={your.database} diff 
--revision=080ee093eb6d7c90888796128f50957659e79361 
--revision=14940b8edd32ecdce27b012f7e9b9528298aa324
monotone --db={your.database} diff 
--revision=37b852e882b92978ee0ff0025f0ca642baf07d7c 
--revision=14940b8edd32ecdce27b012f7e9b9528298aa324
----------------------------------------------------------------------