[Monotone-commits-diffs] Revision 5b9ab4e8fb6e52e3f9df800111818d3cb5e2f1f2

[monotone]

----------------------------------------------------------------------
Revision: 5b9ab4e8fb6e52e3f9df800111818d3cb5e2f1f2
Parent:   3422d473be41bc2d0363ec78b83d7f4693661c06
Parent:   a37f575fb13073d98ad34eaf8f9774b624d06ae6
Author:   Timothy Brownawell  <address@hidden>
Date:     09/19/10 18:30:23
Branch:   net.venge.monotone.netsync

Changelog: 

merge in mainline changes

Changes against parent 3422d473be41bc2d0363ec78b83d7f4693661c06

  added    tests/netsync_dry_run
  added    tests/netsync_dry_run/__driver__.lua
  patched  cmd_netsync.cc
  patched  netsync.cc
  patched  netsync.hh
  patched  network/connection_info.cc
  patched  network/connection_info.hh
  patched  network/netsync_session.cc
  patched  network/netsync_session.hh
  patched  network/session.cc
  patched  refiner.cc
  patched  refiner.hh
  patched  tests/common/netsync.lua

Changes against parent a37f575fb13073d98ad34eaf8f9774b624d06ae6

  patched  NEWS
  patched  cmd_netsync.cc
  patched  cmd_ws_commit.cc
  patched  monotone.texi
  patched  option.cc
  patched  std_hooks.lua
  patched  tests/changelog_editor/__driver__.lua
  patched  tests/changelog_editor/changelog.lua
  patched  tests/commit_default_editor/__driver__.lua
  patched  tests/commit_default_editor/test_hooks.lua
  patched  tests/commit_writes_message_back_to__MTN_log/my_hook.lua
  patched  tests/complete_option_names/__driver__.lua
  patched  tests/i18n_commit_messages/extra_hooks.lua


mtn --db={your.database} diff 
--revision=3422d473be41bc2d0363ec78b83d7f4693661c06 
--revision=5b9ab4e8fb6e52e3f9df800111818d3cb5e2f1f2
mtn --db={your.database} diff 
--revision=a37f575fb13073d98ad34eaf8f9774b624d06ae6 
--revision=5b9ab4e8fb6e52e3f9df800111818d3cb5e2f1f2
----------------------------------------------------------------------