[Monotone-commits-diffs] Revision 6eeae00721c00364c0b72c99e5e51aa7f14f8b87

[monotone]

----------------------------------------------------------------------
Revision: 6eeae00721c00364c0b72c99e5e51aa7f14f8b87
Parent:   5ee3c6fe21d8959dd0b4d115d86bec1f9b7ee9d1
Parent:   d3959bbc9ba52916422e4871de36846232085ef3
Author:   address@hidden
Date:     05/18/10 22:10:32
Branch:   net.venge.monotone

Changelog: 

merge of '5ee3c6fe21d8959dd0b4d115d86bec1f9b7ee9d1'
     and 'd3959bbc9ba52916422e4871de36846232085ef3'

Changes against parent 5ee3c6fe21d8959dd0b4d115d86bec1f9b7ee9d1

  renamed  tests/commit_using__MTN_log/commit_log.lua
       to  tests/commit_using__MTN_log/commit_cancelled.lua
  renamed  tests/commit_using__MTN_log/commit_log_modified_return.lua
       to  tests/commit_using__MTN_log/commit_confirmed.lua
  added    tests/bad_and_unknown_certs
  added    tests/branch_leaves_sync_bug
  added    tests/catch_lua_output
  added    tests/cert_no_branch
  added    tests/changelog_editor
  added    tests/db_check_branch_leaves
  added    tests/disapproving_a_non_head
  added    tests/keep_valid_workspace_options_on_error
  added    tests/log_recognizes_invalid_workspace_parent
  added    tests/log_with_windows_dirsep
  added    tests/merge_--update
  added    tests/netsync_per_server_defaults
  added    tests/setup_creates_internal_db
  added    tests/unchanged_options_preserves_mtime
  added    maybe_workspace_updater.cc
  added    maybe_workspace_updater.hh
  added    rev_output.cc
  added    rev_output.hh
  added    tests/bad_and_unknown_certs/__driver__.lua
  added    tests/branch_leaves_sync_bug/__driver__.lua
  added    tests/catch_lua_output/__driver__.lua
  added    tests/catch_lua_output/hooks.lua
  added    tests/catch_lua_output/hooks_automate.lua
  added    tests/cert_no_branch/__driver__.lua
  added    tests/changelog_editor/__driver__.lua
  added    tests/changelog_editor/changelog.lua
  added    tests/db_check_branch_leaves/__driver__.lua
  added    tests/disapproving_a_non_head/__driver__.lua
  added    tests/keep_valid_workspace_options_on_error/__driver__.lua
  added    tests/log_recognizes_invalid_workspace_parent/__driver__.lua
  added    tests/log_with_windows_dirsep/__driver__.lua
  added    tests/merge_--update/__driver__.lua
  added    tests/netsync_per_server_defaults/__driver__.lua
  added    tests/setup_creates_internal_db/__driver__.lua
  added    tests/unchanged_options_preserves_mtime/__driver__.lua
  patched  INSTALL
  patched  Makefile.am
  patched  NEWS
  patched  cmd_automate.cc
  patched  cmd_diff_log.cc
  patched  cmd_key_cert.cc
  patched  cmd_list.cc
  patched  cmd_merging.cc
  patched  cmd_netsync.cc
  patched  cmd_ws_commit.cc
  patched  contrib/edit_comment_from_changelog.lua
  patched  database.cc
  patched  database.hh
  patched  database_check.cc
  patched  dates.cc
  patched  dates.hh
  patched  file_io.hh
  patched  key_store.cc
  patched  keys.cc
  patched  keys.hh
  patched  lua_hooks.cc
  patched  lua_hooks.hh
  patched  migrate_ancestry.cc
  patched  monotone.cc
  patched  monotone.texi
  patched  network/automate_session.cc
  patched  options_list.hh
  patched  packet.cc
  patched  paths.hh
  patched  po/de.po
  patched  po/es.po
  patched  po/fr.po
  patched  po/it.po
  patched  po/ja.po
  patched  po/pt.po
  patched  po/pt_BR.po
  patched  po/sv.po
  patched  selectors.cc
  patched  simplestring_xform.cc
  patched  simplestring_xform.hh
  patched  std_hooks.lua
  patched  tests/_--author,_--date/__driver__.lua
  patched  tests/_--rcfile=-/__driver__.lua
  patched  tests/_--rcfile=directory/aaa.rc
  patched  tests/_--rcfile=directory/aba.rc
  patched  tests/_--rcfile=directory/bbb.rc
  patched  
tests/_MTN_files_handled_correctly_in_aborted_commit/bad_edit_comment.lua
  patched  tests/attr_command_in_subdirs/__driver__.lua
  patched  tests/attr_set_get_commands/__driver__.lua
  patched  tests/change_workspace/__driver__.lua
  patched  tests/checkout_creates__MTN_log/commit_log.lua
  patched  tests/clone_creates__MTN_log/commit_log.lua
  patched  tests/commit_default_editor/test_hooks.lua
  patched  tests/commit_using__MTN_log/__driver__.lua
  patched  tests/commit_using__MTN_log/commit_cancelled.lua
  patched  tests/commit_using__MTN_log/commit_confirmed.lua
  patched  tests/commit_using__MTN_log_and_--message/commit_log.lua
  patched  tests/commit_validation_lua_hook/errmsg
  patched  tests/commit_with_--message-file/commit_log.lua
  patched  tests/commit_writes_message_back_to__MTN_log/__driver__.lua
  patched  tests/commit_writes_message_back_to__MTN_log/my_hook.lua
  patched  tests/common/netsync-hooks.lua
  patched  tests/db_check_and_non-serious_errors/__driver__.lua
  patched  tests/db_kill_tag_locally/__driver__.lua
  patched  tests/diff_--external/__driver__.lua
  patched  tests/empty_environment/__driver__.lua
  patched  tests/git_export/__driver__.lua
  patched  tests/i18n_commit_messages/__driver__.lua
  patched  tests/i18n_commit_messages/euc-jp.txt
  patched  tests/i18n_commit_messages/extra_hooks.lua
  patched  tests/i18n_commit_messages/utf8.txt
  patched  tests/importing_cvs_metadata/expected_log_output
  patched  tests/importing_cvs_tricky_repo_with_tags/test.tags
  patched  tests/ls_tags_with_ambiguous_tags/__driver__.lua
  patched  tests/lua_function_existsonpath/__driver__.lua
  patched  tests/merge_into_workspace/expected-log
  patched  tests/merge_into_workspace/expected-log-left
  patched  tests/netsync_default_server_pattern/__driver__.lua
  patched  tests/resolve_conflicts_all_resolutions/__driver__.lua
  patched  tests/resolve_conflicts_all_resolutions/merge-1
  patched  tests/resolve_conflicts_content/merge-1
  patched  tests/resolve_conflicts_duplicate_name/merge-1
  patched  tests/resolve_conflicts_none/merge-1
  patched  tests/resolve_conflicts_propagate/propagate-1
  patched  tests/resolve_conflicts_propagate/propagate-2
  patched  tests/serve-automate/__driver__.lua
  patched  tests/serve-automate-single-run/__driver__.lua
  patched  tests/status/__driver__.lua
  patched  tests/suspend/__driver__.lua
  patched  tests/tags_and_tagging_of_revisions/__driver__.lua
  patched  tests/user_commands/__driver__.lua
  patched  tests/user_commands/extra_rc
  patched  unit-tests/dates.cc
  patched  unit-tests/simplestring_xform.cc
  patched  win32/main.cc
  patched  work.cc
  patched  work.hh

Changes against parent d3959bbc9ba52916422e4871de36846232085ef3

  patched  INSTALL


mtn --db={your.database} diff 
--revision=5ee3c6fe21d8959dd0b4d115d86bec1f9b7ee9d1 
--revision=6eeae00721c00364c0b72c99e5e51aa7f14f8b87
mtn --db={your.database} diff 
--revision=d3959bbc9ba52916422e4871de36846232085ef3 
--revision=6eeae00721c00364c0b72c99e5e51aa7f14f8b87
----------------------------------------------------------------------