[Monotone-commits-diffs] Revision 4dee6e03bdca7f29127d8a170955a1dd2aa82482

[monotone]

----------------------------------------------------------------------
Revision: 4dee6e03bdca7f29127d8a170955a1dd2aa82482
Parent:   80306e51bf8477f2af1f25092fae9c6370ad8dcd
Parent:   ba43c357c21039f465bc17d4a8dfc88ebac5f465
Author:   Timothy Brownawell  <address@hidden>
Date:     09/10/10 02:19:29
Branch:   net.venge.monotone.tbrownaw.policy-branches

Changelog: 

merge in mainline changes

Changes against parent 80306e51bf8477f2af1f25092fae9c6370ad8dcd

  added    policies
  added    tests/policy-basic
  added    tests/policy-keys
  added    tests/policy-netsync
  added    tests/policy-subpolicies
  added    tests/policy-tags
  added    branch_name.cc
  added    branch_name.hh
  added    cmd_policy.cc
  added    policies/base_policy.cc
  added    policies/base_policy.hh
  added    policies/branch.cc
  added    policies/branch.hh
  added    policies/delegation.cc
  added    policies/delegation.hh
  added    policies/editable_policy.cc
  added    policies/editable_policy.hh
  added    policies/outdatable_policy.cc
  added    policies/outdatable_policy.hh
  added    policies/policy.cc
  added    policies/policy.hh
  added    policies/policy_branch.cc
  added    policies/policy_branch.hh
  added    tests/policy-basic/__driver__.lua
  added    tests/policy-keys/__driver__.lua
  added    tests/policy-netsync/__driver__.lua
  added    tests/policy-subpolicies/__driver__.lua
  added    tests/policy-tags/__driver__.lua
  patched  Makefile.am
  patched  asciik.cc
  patched  automate.cc
  patched  cmd_db.cc
  patched  cmd_diff_log.cc
  patched  cmd_files.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  database.cc
  patched  database.hh
  patched  enumerator.cc
  patched  enumerator.hh
  patched  epoch.cc
  patched  epoch.hh
  patched  lua_hooks.cc
  patched  lua_hooks.hh
  patched  luaext_platform.cc
  patched  migrate_ancestry.cc
  patched  network/netsync_session.cc
  patched  network/netsync_session.hh
  patched  options.hh
  patched  options_list.hh
  patched  origin_type.hh
  patched  project.cc
  patched  project.hh
  patched  sanity.cc
  patched  sanity.hh
  patched  selectors.cc
  patched  std_hooks.lua
  patched  tester.cc
  patched  transforms.hh
  patched  vocab_terms.hh

Changes against parent ba43c357c21039f465bc17d4a8dfc88ebac5f465

  patched  NEWS
  patched  database.cc
  patched  tests/warn_on_weird_branch_names/__driver__.lua


mtn --db={your.database} diff 
--revision=80306e51bf8477f2af1f25092fae9c6370ad8dcd 
--revision=4dee6e03bdca7f29127d8a170955a1dd2aa82482
mtn --db={your.database} diff 
--revision=ba43c357c21039f465bc17d4a8dfc88ebac5f465 
--revision=4dee6e03bdca7f29127d8a170955a1dd2aa82482
----------------------------------------------------------------------