[Monotone-commits-diffs] Revision 1041dce2c2ff54a36ed3056069c5dfcc21153b52

[monotone]

-----------------------------------------------------------------
Revision: 1041dce2c2ff54a36ed3056069c5dfcc21153b52
Ancestor: 0dc47ed1bf74c0657e79a43b85fa870765b6de64
Ancestor: b9c333c2a525feeebe42330c8083d54c03666c52
Author: Timothy Brownawell  <address@hidden>
Date: 2010-06-14 04.52.53
Branch: net.venge.monotone.extended-selectors

Renamed entries:
        unix/parse_time.cc to unix/parse_date.cc
        win32/parse_time.cc to win32/parse_date.cc
Added files:
        tests/extended-selectors/__driver__.lua
        tests/status_with_no_key/__driver__.lua
Added directories:
        tests/extended-selectors tests/status_with_no_key
Modified files:
        INSTALL Makefile.am NEWS UPGRADE base.hh cmd_automate.cc
        cmd_ws_commit.cc configure.ac database.cc dates.cc
        lua-testsuite.lua monotone.texi platform.hh 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 selectors.cc
        std_hooks.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
        unit-tests/dates.cc unit-tests/roster.cc unix/parse_date.cc
        visualc/config.h win32/parse_date.cc

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=0dc47ed1bf74c0657e79a43b85fa870765b6de64 
--revision=1041dce2c2ff54a36ed3056069c5dfcc21153b52
monotone --db={your.database} diff 
--revision=b9c333c2a525feeebe42330c8083d54c03666c52 
--revision=1041dce2c2ff54a36ed3056069c5dfcc21153b52
----------------------------------------------------------------------