[Monotone-commits-diffs] Revision ab39440511ffd73f7c33651f878c7b3cd0bc609b

[monotone]

-----------------------------------------------------------------
Revision: ab39440511ffd73f7c33651f878c7b3cd0bc609b
Ancestor: 8e35cccb291bc76934cf8da825dfd465267ad74e
Ancestor: d9c3c3a85ff46d002e29aaaa55e7138862c0103f
Author: Timothy Brownawell  <address@hidden>
Date: 2006-02-25T01:48:51
Branch: net.venge.monotone

Added files:
        tests/t_cvsimport_branch.at tests/t_db_kill_rev_locally_2.at
        tests/t_log_nofiles_nomerges.at tests/t_log_selectors.at
        tests/t_log_to_file.at tests/t_revert_new_project.at
Modified files:
        ChangeLog Makefile.am app_state.cc app_state.hh commands.cc
        contrib/color-logs.conf contrib/color-logs.sh
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        contrib/monotone.el contrib/usher.cc cset.cc cset.hh
        database.cc enumerator.cc enumerator.hh lua.cc lua.hh
        monotone.cc monotone.texi netcmd.cc netcmd.hh netsync.cc
        options.hh po/sv.po roster.cc roster.hh roster_merge.cc
        roster_merge.hh sanity.cc sanity.hh sqlite/alter.c
        sqlite/btree.c sqlite/btree.h sqlite/build.c sqlite/date.c
        sqlite/delete.c sqlite/expr.c sqlite/func.c sqlite/insert.c
        sqlite/main.c sqlite/os_common.h sqlite/os_unix.c
        sqlite/os_win.c sqlite/pager.c sqlite/pager.h sqlite/parse.c
        sqlite/pragma.c sqlite/prepare.c sqlite/select.c
        sqlite/sqlite3.h sqlite/sqliteInt.h sqlite/table.c
        sqlite/tokenize.c sqlite/update.c sqlite/util.c
        sqlite/vdbe.c sqlite/vdbe.h sqlite/vdbeapi.c
        sqlite/vdbeaux.c sqlite/where.c std_hooks.lua test_hooks.lua
        tests/t_netsync_permissions.at testsuite.at ui.cc ui.hh
        unit_tests.cc unit_tests.hh work.cc work.hh

ChangeLog: 

merge of 8e35cccb291bc76934cf8da825dfd465267ad74e
     and d9c3c3a85ff46d002e29aaaa55e7138862c0103f


monotone --db={your.database} diff 
--revision=8e35cccb291bc76934cf8da825dfd465267ad74e 
--revision=ab39440511ffd73f7c33651f878c7b3cd0bc609b
monotone --db={your.database} diff 
--revision=d9c3c3a85ff46d002e29aaaa55e7138862c0103f 
--revision=ab39440511ffd73f7c33651f878c7b3cd0bc609b
----------------------------------------------------------------------