[Monotone-commits-diffs] Revision a9421b49d66f47f42c14484ef9e0ea49e7702789

[monotone]

----------------------------------------------------------------------
Revision: a9421b49d66f47f42c14484ef9e0ea49e7702789
Parent:   2bba0ff15d7a97abdcd19f35fc3b631a640ef855
Parent:   dbaf407d90176c5ef88c21016e6fe1a4a4534ee7
Author:   address@hidden
Date:     08/28/10 00:53:20
Branch:   net.venge.monotone

Changelog: 

merge of '2bba0ff15d7a97abdcd19f35fc3b631a640ef855'
     and 'dbaf407d90176c5ef88c21016e6fe1a4a4534ee7'

Changes against parent 2bba0ff15d7a97abdcd19f35fc3b631a640ef855

  patched  contrib/monotone-notify.pl

Changes against parent dbaf407d90176c5ef88c21016e6fe1a4a4534ee7

  renamed  tests/automate_genkey
       to  tests/automate_generate_key
  renamed  tests/automate_read_packets
       to  tests/automate_key_manage
  added    tests/manpage
  added    key_packet.cc
  added    key_packet.hh
  added    tests/common/basic_io.lua
  added    tests/manpage/__driver__.lua
  added    unit-tests/key_packet.cc
  patched  .mtn-ignore
  patched  Makefile.am
  patched  NEWS
  patched  automate.cc
  patched  automate_ostream.hh
  patched  automate_ostream_demuxed.hh
  patched  automate_stdio_helpers.hh
  patched  cmd.cc
  patched  cmd_key_cert.cc
  patched  cmd_packet.cc
  patched  commands.cc
  patched  globish.cc
  patched  lua_hooks.cc
  patched  lua_hooks.hh
  patched  monotone.texi
  patched  option.cc
  patched  options_list.hh
  patched  po/de.po
  patched  sanity.cc
  patched  std_hooks.lua
  patched  tests/automate_generate_key/__driver__.lua
  patched  tests/automate_inventory/__driver__.lua
  patched  tests/automate_inventory_ignore_dirs/__driver__.lua
  patched  tests/automate_inventory_options/__driver__.lua
  patched  tests/automate_inventory_restricted/__driver__.lua
  patched  tests/automate_key_manage/__driver__.lua
  patched  tests/automate_show_conflicts_defaults/__driver__.lua
  patched  tests/common/test_utils_inventory.lua
  patched  tests/renaming_a_directory/__driver__.lua
  patched  tests/trust_hooks_and_trusted_command/__driver__.lua
  patched  ui.cc
  patched  ui.hh
  patched  unit-tests/globish.cc


mtn --db={your.database} diff 
--revision=2bba0ff15d7a97abdcd19f35fc3b631a640ef855 
--revision=a9421b49d66f47f42c14484ef9e0ea49e7702789
mtn --db={your.database} diff 
--revision=dbaf407d90176c5ef88c21016e6fe1a4a4534ee7 
--revision=a9421b49d66f47f42c14484ef9e0ea49e7702789
----------------------------------------------------------------------