[Monotone-commits-diffs] Revision bb03b85b1bf15fbaa4da116393973c7359d6a279

[monotone]

----------------------------------------------------------------------
Revision: bb03b85b1bf15fbaa4da116393973c7359d6a279
Parent:   6eeae00721c00364c0b72c99e5e51aa7f14f8b87
Parent:   f96c287ccface2cb83b381e43c0087521e9ccc0d
Author:   address@hidden
Date:     07/07/10 18:39:32
Branch:   net.venge.monotone

Changelog: 

merge of '6eeae00721c00364c0b72c99e5e51aa7f14f8b87'
     and 'f96c287ccface2cb83b381e43c0087521e9ccc0d'

Changes against parent 6eeae00721c00364c0b72c99e5e51aa7f14f8b87

  dropped  tests/(todo)_write_monotone-agent
  dropped  tests/(todo)_write_monotone-agent/__driver__.lua
  dropped  tests/db_kill_branch_certs_locally_command
  dropped  tests/db_kill_branch_certs_locally_command/__driver__.lua
  dropped  tests/db_kill_tag_locally
  dropped  tests/db_kill_tag_locally/__driver__.lua
  renamed  tests/restricted_diff_bug
       to  tests/restricted_diff_file_in_renamed_dir
  renamed  tests/restriction_excludes_parent_dir
       to  tests/restriction_includes_parent_dir
  renamed  tests/setup_creates_internal_db
       to  tests/setup_creates_default_db
  renamed  win32/monotone.iss
       to  win32/monotone.iss.in
  added    tests/add,remove,cleanup_registered_workspaces
  added    tests/annotate_ignores_untrusted_certs
  added    tests/automate_log
  added    tests/clone_aborts_on_branch_pattern_in_uri
  added    tests/database_aliases
  added    tests/db_kill_certs_locally
  added    tests/diff_patch_add
  added    tests/diff_patch_drop
  added    tests/diff_patch_rename
  added    tests/disapproving_of_a_merge_revision
  added    tests/disapproving_of_a_revision_range
  added    tests/disapproving_of_bad_revision_range
  added    tests/extended-selectors
  added    tests/list_databases
  added    tests/rename_warns_on_subdir_move
  added    tests/setup_and_clone_keep_bookkeeping_dir
  added    tests/status_with_no_key
  added    tests/undrop
  added    tests/update_does_not_suggest_suspended_branches
  added    tests/update_ignores_suspended_heads
  added    netsync.hh
  added    tests/add,remove,cleanup_registered_workspaces/__driver__.lua
  added    tests/annotate_ignores_untrusted_certs/__driver__.lua
  added    tests/annotate_ignores_untrusted_certs/all_untrusted.lua
  added    tests/annotate_ignores_untrusted_certs/author_untrusted.lua
  added    tests/annotate_ignores_untrusted_certs/date_untrusted.lua
  added    
tests/automate_inventory_options/expected-renames-target-no-unchanged.stdout
  added    tests/automate_log/__driver__.lua
  added    tests/clone_aborts_on_branch_pattern_in_uri/__driver__.lua
  added    tests/database_aliases/__driver__.lua
  added    tests/database_aliases/rcfile.lua
  added    tests/db_kill_certs_locally/__driver__.lua
  added    tests/diff_patch_add/__driver__.lua
  added    tests/diff_patch_drop/__driver__.lua
  added    tests/diff_patch_rename/__driver__.lua
  added    tests/disapproving_of_a_merge_revision/__driver__.lua
  added    tests/disapproving_of_a_merge_revision/badfile
  added    tests/disapproving_of_a_merge_revision/badfile2
  added    tests/disapproving_of_a_merge_revision/goodfile
  added    tests/disapproving_of_a_merge_revision/rootfile
  added    tests/disapproving_of_a_revision_range/__driver__.lua
  added    tests/disapproving_of_a_revision_range/badfile
  added    tests/disapproving_of_a_revision_range/badfile2
  added    tests/disapproving_of_a_revision_range/finalfile
  added    tests/disapproving_of_a_revision_range/goodfile
  added    tests/disapproving_of_a_revision_range/rootfile
  added    tests/disapproving_of_a_revision_range/updatefile
  added    tests/disapproving_of_bad_revision_range/__driver__.lua
  added    tests/extended-selectors/__driver__.lua
  added    tests/list_databases/__driver__.lua
  added    tests/list_databases/rcfile.lua
  added    tests/rename_warns_on_subdir_move/__driver__.lua
  added    tests/setup_and_clone_keep_bookkeeping_dir/__driver__.lua
  added    tests/setup_creates_default_db/rcfile.lua
  added    tests/status_with_no_key/__driver__.lua
  added    tests/trust_hooks_and_trusted_command/hooks.lua
  added    tests/undrop/__driver__.lua
  added    tests/update_does_not_suggest_suspended_branches/__driver__.lua
  added    tests/update_ignores_suspended_heads/__driver__.lua
  added    unix/parse_date.cc
  added    win32/dlls.sh
  added    win32/parse_date.cc
  patched  HACKING
  patched  INSTALL
  patched  Makefile.am
  patched  NEWS
  patched  UPGRADE
  patched  annotate.cc
  patched  app_state.cc
  patched  app_state.hh
  patched  automate.cc
  patched  base.hh
  patched  cmd.cc
  patched  cmd_automate.cc
  patched  cmd_db.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_othervcs.cc
  patched  cmd_packet.cc
  patched  cmd_ws_commit.cc
  patched  configure.ac
  patched  contrib/mtn_makepermissions
  patched  database.cc
  patched  database.hh
  patched  dates.cc
  patched  globish.cc
  patched  globish.hh
  patched  key_store.cc
  patched  keys.cc
  patched  keys.hh
  patched  lazy_rng.hh
  patched  lua-testsuite.lua
  patched  lua_hooks.cc
  patched  lua_hooks.hh
  patched  merge_conflict.cc
  patched  migrate_ancestry.cc
  patched  monotone.cc
  patched  monotone.texi
  patched  netcmd.hh
  patched  netsync.cc
  patched  network/automate_session.cc
  patched  network/connection_info.cc
  patched  network/connection_info.hh
  patched  network/netsync_session.cc
  patched  network/session.cc
  patched  network/wrapped_session.cc
  patched  network/wrapped_session.hh
  patched  netxx_pipe.cc
  patched  notes/release-checklist.txt
  patched  options_list.hh
  patched  outdated_indicator.cc
  patched  outdated_indicator.hh
  patched  paths.cc
  patched  paths.hh
  patched  platform.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  project.cc
  patched  project.hh
  patched  restrictions.cc
  patched  restrictions.hh
  patched  rev_output.cc
  patched  roster.cc
  patched  roster.hh
  patched  sanity.cc
  patched  selectors.cc
  patched  selectors.hh
  patched  std_hooks.lua
  patched  testlib.lua
  patched  tests/attr_mtn_execute/__driver__.lua
  patched  tests/automate_inventory_ignore_dirs/expected.stderr
  patched  tests/automate_inventory_ignore_dirs/expected.stdout
  patched  tests/automate_inventory_ignore_dirs/expected_2.stderr
  patched  tests/automate_inventory_ignore_dirs/expected_2.stdout
  patched  tests/automate_inventory_options/__driver__.lua
  patched  tests/automate_inventory_options/expected-no-ignored.stdout
  patched  tests/automate_inventory_options/expected-no-unknown.stdout
  patched  tests/automate_inventory_options/expected-none.stdout
  patched  tests/automate_inventory_options/expected-renames-both.stdout
  patched  tests/automate_inventory_options/expected-renames-source.stdout
  patched  
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
  patched  
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
  patched  tests/automate_inventory_options/expected-renames-target.stdout
  patched  tests/automate_inventory_restricted/__driver__.lua
  patched  tests/branch_leaves_sync_bug/__driver__.lua
  patched  tests/cert_no_branch/__driver__.lua
  patched  tests/changelog_editor/__driver__.lua
  patched  tests/changelog_editor/changelog.lua
  patched  tests/clone_branch_no_dir/__driver__.lua
  patched  tests/clone_creates__MTN_log/__driver__.lua
  patched  tests/clone_creates_right__MTN_options/__driver__.lua
  patched  tests/clone_validates_target_directory/__driver__.lua
  patched  tests/clone_warning_with_multiple_heads/__driver__.lua
  patched  tests/commit_default_editor/__driver__.lua
  patched  tests/common/automate_ancestry.lua
  patched  tests/common/automate_stdio.lua
  patched  tests/common/netsync.lua
  patched  tests/db_kill_rev_locally/__driver__.lua
  patched  tests/db_kill_rev_locally_and_recommit/__driver__.lua
  patched  tests/db_kill_rev_locally_workspace/__driver__.lua
  patched  tests/diff_against_empty_file/__driver__.lua
  patched  tests/diff_on_missing_trailing_newline_at_end_of_file/__driver__.lua
  patched  tests/diff_restriction_renamed_parent/__driver__.lua
  patched  tests/diff_shows_renames/__driver__.lua
  patched  
tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
  patched  tests/diffing_a_revision_with_an_added_file/__driver__.lua
  patched  tests/fetching_nonexistent_entry_from_children_bug/__driver__.lua
  patched  tests/imp_test_filesync_confdir/__driver__.lua
  patched  tests/import/__driver__.lua
  patched  
tests/include()_includedir()_and_includedirpattern()_lua_functions/aaa.rc
  patched  
tests/include()_includedir()_and_includedirpattern()_lua_functions/aba.rc
  patched  
tests/include()_includedir()_and_includedirpattern()_lua_functions/bbb.zz
  patched  tests/log_--diffs/__driver__.lua
  patched  tests/log_--diffs/expect_full
  patched  tests/log_--diffs/expect_restrict
  patched  tests/log_dir/__driver__.lua
  patched  tests/log_with_restriction/__driver__.lua
  patched  
tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
  patched  tests/manifest_restrictions/__driver__.lua
  patched  tests/merge_into_workspace/__driver__.lua
  patched  tests/merge_update_part_of_file/__driver__.lua
  patched  tests/netsync_default_server_pattern/__driver__.lua
  patched  tests/netsync_mtn_uri_scheme/__driver__.lua
  patched  tests/netsync_over_pipes/__driver__.lua
  patched  tests/netsync_verifies_server_keys/__driver__.lua
  patched  tests/resolve_conflicts_all_merge_commands/__driver__.lua
  patched  tests/restricted_diff_file_in_renamed_dir/__driver__.lua
  patched  tests/restriction_includes_parent_dir/__driver__.lua
  patched  tests/restrictions_with_renames_and_adds/__driver__.lua
  patched  tests/revert_file_to_base_revision/__driver__.lua
  patched  tests/setup_creates_default_db/__driver__.lua
  patched  tests/subdirectory_restrictions/__driver__.lua
  patched  tests/test_hooks.lua
  patched  tests/trust_hooks_and_trusted_command/__driver__.lua
  patched  tests/update_to_off-branch_rev/__driver__.lua
  patched  tests/use_restrictions_with_--exclude/__driver__.lua
  patched  tests/user_commands/extra_rc
  patched  tests/vars/__driver__.lua
  patched  texinfo.css
  patched  unit-tests/dates.cc
  patched  unit-tests/restrictions.cc
  patched  unit-tests/roster.cc
  patched  update.cc
  patched  update.hh
  patched  uri.cc
  patched  uri.hh
  patched  visualc/config.h
  patched  vocab.hh
  patched  win32/README
  patched  win32/monotone.iss.in
  patched  win32/process.cc
  patched  work.cc
  patched  work.hh

Changes against parent f96c287ccface2cb83b381e43c0087521e9ccc0d

  patched  INSTALL


mtn --db={your.database} diff 
--revision=6eeae00721c00364c0b72c99e5e51aa7f14f8b87 
--revision=bb03b85b1bf15fbaa4da116393973c7359d6a279
mtn --db={your.database} diff 
--revision=f96c287ccface2cb83b381e43c0087521e9ccc0d 
--revision=bb03b85b1bf15fbaa4da116393973c7359d6a279
----------------------------------------------------------------------