[Monotone-commits-diffs] Revision 4177f37b8bb41931d3bcd1c20e0078b46cbf3b98

[monotone]

-----------------------------------------------------------------
Revision: 4177f37b8bb41931d3bcd1c20e0078b46cbf3b98
Ancestor: 594ae8fdeeec49ef707e22b54c2c96d84f1a730b
Ancestor: b9c333c2a525feeebe42330c8083d54c03666c52
Author: Timothy Brownawell  <address@hidden>
Date: 2010-06-14 04.44.13
Branch: net.venge.monotone.kill_certs_locally

Deleted entries:
        tests/db_kill_branch_certs_locally_command
        tests/db_kill_branch_certs_locally_command/__driver__.lua
        tests/db_kill_tag_locally
        tests/db_kill_tag_locally/__driver__.lua
Added files:
        tests/db_kill_certs_locally/__driver__.lua
        tests/status_with_no_key/__driver__.lua
Added directories:
        tests/db_kill_certs_locally tests/status_with_no_key
Modified files:
        INSTALL Makefile.am NEWS UPGRADE base.hh cmd_automate.cc
        cmd_db.cc cmd_key_cert.cc cmd_ws_commit.cc configure.ac
        database.cc database.hh lua-testsuite.lua monotone.texi
        po/de.po po/es.po po/fr.po po/it.po po/ja.po po/pt.po
        po/pt_BR.po po/sv.po roster.cc roster.hh sanity.cc
        std_hooks.lua tests/cert_no_branch/__driver__.lua
        tests/changelog_editor/__driver__.lua
        tests/diff_patch_drop/__driver__.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/update_to_off-branch_rev/__driver__.lua
        unit-tests/dates.cc unit-tests/roster.cc visualc/config.h

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=594ae8fdeeec49ef707e22b54c2c96d84f1a730b 
--revision=4177f37b8bb41931d3bcd1c20e0078b46cbf3b98
monotone --db={your.database} diff 
--revision=b9c333c2a525feeebe42330c8083d54c03666c52 
--revision=4177f37b8bb41931d3bcd1c20e0078b46cbf3b98
----------------------------------------------------------------------