----------------------------------------------------------------- Revision: e97e420da296870c18f0c2202804e637da3032ec Ancestor: 303359adebe98bd4baf3686359f04f0a8e089535 Ancestor: a7771c71a91932b30e065a34dab900fce64d2053 Author: de...@echologic.com Date: 2009-08-17T04:12:29 Branch: net.venge.monotone.asio
Deleted entries: i18n.h indent_script m4/xgettextflag.m4 mkstemp.hh monotone.spec package_full_revision.h package_revision.h tests/spawn_redirected_hook_helper tests/spawn_redirected_hook_helper/__driver__.lua tests/spawn_redirected_hook_helper/testhooks Renamed entries: boost to Attic/boost crypto_tests.cc to unit-tests/sha1.cc diff_patch.cc to diff_output.cc diff_patch.hh to diff_output.hh m4/netxx.m4 to Attic/netxx.m4 merge.cc to merge_content.cc merge.hh to merge_content.hh netxx to Attic/netxx netxx_pipe.cc to Attic/netxx_pipe.cc netxx_pipe.hh to Attic/netxx_pipe.hh numeric_vocab.cc to unit-tests/numeric_vocab.cc 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 string_queue.cc to unit-tests/string_queue.cc unit_tests.cc to unit_tester.cc unix/tester-check-net.cc to Attic/unix-tester-check-net.cc win32/tester-check-net.cc to Attic/win32-tester-check-net.cc work_migration.cc to migrate_work.cc Added files: ancestry.cc cmd.cc git_change.cc git_change.hh git_export.cc git_export.hh m4/asio.m4 merge_3way.cc merge_conflict.cc migrate_ancestry.cc roster_tests.hh tester-tests/running_commands/__driver__.lua tester-tests/running_commands/script tests/attr_set_drop/__driver__.lua tests/clobbered_attrs/__driver__.lua tests/commit_default_editor/__driver__.lua tests/commit_default_editor/test_hooks.lua tests/date_formatting/__driver__.lua tests/delta_directions/__driver__.lua tests/diff_reverse/__driver__.lua tests/exception-in-luaext/__driver__.lua tests/exception-in-luaext/evilrc.lua tests/git_export/__driver__.lua tests/git_export_rename_loop/__driver__.lua tests/log_from_to_revision/__driver__.lua tests/m_selector/__driver__.lua tests/merge_into_workspace_mtn_execute/__driver__.lua tests/move_conflicting_unversioned/__driver__.lua tests/pluck_mtn_execute/__driver__.lua tests/revert_attrs/__driver__.lua tests/revert_directory_blocked_by_unversioned_directory/__driver__.lua tests/revert_directory_blocked_by_unversioned_file/__driver__.lua tests/revert_directory_replaced_by_file/__driver__.lua tests/revert_file_blocked_by_unversioned_file/__driver__.lua tests/revert_file_replaced_by_directory/__driver__.lua tests/revert_renamed_directory_replaced_by_file/__driver__.lua tests/revert_renamed_file_replaced_by_directory/__driver__.lua tests/revert_uncommitted_execute_attr/__driver__.lua tests/skip_invalid_paths/__driver__.lua tests/u_selector/__driver__.lua tests/update_loses_execute/__driver__.lua tests/w_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 Added directories: tester-tests/running_commands tests/attr_set_drop tests/clobbered_attrs tests/commit_default_editor tests/date_formatting tests/delta_directions tests/diff_reverse tests/exception-in-luaext tests/git_export tests/git_export_rename_loop tests/log_from_to_revision tests/m_selector tests/merge_into_workspace_mtn_execute tests/move_conflicting_unversioned tests/pluck_mtn_execute tests/revert_attrs tests/revert_directory_blocked_by_unversioned_directory tests/revert_directory_blocked_by_unversioned_file tests/revert_directory_replaced_by_file tests/revert_file_blocked_by_unversioned_file tests/revert_file_replaced_by_directory tests/revert_renamed_directory_replaced_by_file tests/revert_renamed_file_replaced_by_directory tests/revert_uncommitted_execute_attr tests/skip_invalid_paths tests/u_selector tests/update_loses_execute tests/w_selector unit-tests Modified files: .mtn-ignore AUTHORS Attic/netxx.m4 Attic/netxx_pipe.cc Attic/netxx_pipe.hh Attic/unix-tester-check-net.cc Attic/win32-tester-check-net.cc INSTALL Makefile.am NEWS 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_conflicts.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/command/init.lua contrib/monotone-mail-notify.sh 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.hh file_io.cc file_io.hh 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 lazy_rng.hh lcs.cc lcs.hh 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/library.m4 m4/mtn-gettext.m4 m4/numeric_vocab.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.texi mt_version.cc mt_version.hh mtn-sanity.cc mtn-sanity.hh netcmd.cc netcmd.hh netio.hh netsync.cc notes/release-checklist.txt numeric_vocab.hh option.cc option.hh options.cc options.hh options_list.hh origin_type.hh outdated_indicator.cc outdated_indicator.hh packet.cc packet.hh parallel_iter.hh paths.cc paths.hh pch.hh platform-wrapped.hh platform.hh po/de.po po/es.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/_MTN_case-folding_security_patch/__driver__.lua tests/attr_mtn_execute/__driver__.lua tests/attr_set_get_commands/__driver__.lua tests/automate_content_diff/__driver__.lua tests/automate_get_current_revision/__driver__.lua tests/commit_with_--message-file/__driver__.lua tests/db_data_format_checking/__driver__.lua tests/defecting_attributes/__driver__.lua tests/dump_on_crash/__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/min_hooks.lua tests/mtn_execute_attr_respects_umask/__driver__.lua tests/p_selector/__driver__.lua tests/quiet_turns_off_tickers_but_not_warnings/__driver__.lua tests/resolve_conflicts_content/update-1 tests/resolve_conflicts_none/update-1 tests/revert_file_blocked_by_unversioned_directory/__driver__.lua tests/revert_the_middle_of_a_sequence/__driver__.lua tests/schema_migration/__driver__.lua tests/schema_migration_with_rosterify/__driver__.lua tests/ssh_agent/__driver__.lua tests/test_hooks.lua tests/unnormalized_paths_in_database/__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: util/mtnopt.in ChangeLog: propagate from branch 'net.venge.monotone' (head a7771c71a91932b30e065a34dab900fce64d2053) to branch 'net.venge.monotone.asio' (head 303359adebe98bd4baf3686359f04f0a8e089535) monotone --db={your.database} diff --revision=303359adebe98bd4baf3686359f04f0a8e089535 --revision=e97e420da296870c18f0c2202804e637da3032ec monotone --db={your.database} diff --revision=a7771c71a91932b30e065a34dab900fce64d2053 --revision=e97e420da296870c18f0c2202804e637da3032ec ---------------------------------------------------------------------- _______________________________________________ Monotone-commits-nodiffs mailing list Monotone-commits-nodiffs@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs