[Monotone-commits-diffs] Revision a752a918f3f8177c1308a44272059f8ca7b911e3

[monotone]

-----------------------------------------------------------------
Revision: a752a918f3f8177c1308a44272059f8ca7b911e3
Ancestor: 1da99d2820c7dfb561b4f1638300183129b90e31
Ancestor: 510225ec4867be0f06b1c210e42ecab24038e0af
Author: address@hidden
Date: 2007-02-23T10:48:16
Branch: net.venge.monotone

Added files:
        tests/add_unknown_ignored/__driver__.lua
        tests/add_unknown_recursive/__driver__.lua
        tests/add_unknown_recursive_ignored/__driver__.lua
        tests/annotate_accidental_clean_merge/__driver__.lua
Added directories:
        tests/add_unknown_ignored tests/add_unknown_recursive
        tests/add_unknown_recursive_ignored
        tests/annotate_accidental_clean_merge
Modified files:
        NEWS annotate.cc cmd_ws_commit.cc
        contrib/monotone.bash_completion database.cc database.hh
        roster_delta.cc roster_delta.hh tester.cc tester.lua
        tests/import/__driver__.lua

ChangeLog: 

merge of '1da99d2820c7dfb561b4f1638300183129b90e31'
     and '510225ec4867be0f06b1c210e42ecab24038e0af'


monotone --db={your.database} diff 
--revision=1da99d2820c7dfb561b4f1638300183129b90e31 
--revision=a752a918f3f8177c1308a44272059f8ca7b911e3
monotone --db={your.database} diff 
--revision=510225ec4867be0f06b1c210e42ecab24038e0af 
--revision=a752a918f3f8177c1308a44272059f8ca7b911e3
----------------------------------------------------------------------