[Monotone-commits-diffs] Revision 1b352eecb83da8e3214eb39c7e63624e3ae686e6

[monotone]

-----------------------------------------------------------------
Revision: 1b352eecb83da8e3214eb39c7e63624e3ae686e6
Ancestor: 2bb550b615c6a2338d2426436f435e2ee6843489
Ancestor: 8af625092fcee28e9cee1eadbf4e4ff617f133bd
Author: address@hidden
Date: 2007-02-22T09:50:39
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
        tests/rename_in_new_workspace/__driver__.lua vocab_cast.hh
Added directories:
        tests/add_unknown_ignored tests/add_unknown_recursive
        tests/add_unknown_recursive_ignored
        tests/annotate_accidental_clean_merge
        tests/rename_in_new_workspace
Modified files:
        annotate.cc app_state.cc automate.cc cert.cc cert.hh
        cmd_db.cc cmd_key_cert.cc cmd_list.cc cmd_merging.cc
        cmd_netsync.cc cmd_ws_commit.cc commands.cc
        contrib/monotone.bash_completion database.cc database.hh
        do-editor-vars.sh epoch.cc epoch.hh globish.cc globish.hh
        key_store.cc lua.cc lua_hooks.cc lua_hooks.hh
        luaext_globish.cc netcmd.cc netcmd.hh netsync.cc netsync.hh
        options_list.hh project.cc project.hh rcs_import.cc
        revision.cc roster.cc roster_delta.cc roster_delta.hh
        tester.cc tester.lua tests/import/__driver__.lua
        tests/rename_file_to_dir/__driver__.lua unix/cputime.cc
        unix/fs.cc unix/get_system_flavour.cc unix/inodeprint.cc
        unix/make_io_binary.cc unix/os_strerror.cc unix/process.cc
        unix/read_password.cc unix/terminal.cc update.cc
        vocab_terms.hh win32/cputime.cc win32/fs.cc
        win32/get_system_flavour.cc win32/inodeprint.cc
        win32/make_io_binary.cc win32/os_strerror.cc
        win32/process.cc win32/read_password.cc win32/terminal.cc
        work.cc work.hh

ChangeLog: 

merge of '2bb550b615c6a2338d2426436f435e2ee6843489'
     and '8af625092fcee28e9cee1eadbf4e4ff617f133bd'


monotone --db={your.database} diff 
--revision=2bb550b615c6a2338d2426436f435e2ee6843489 
--revision=1b352eecb83da8e3214eb39c7e63624e3ae686e6
monotone --db={your.database} diff 
--revision=8af625092fcee28e9cee1eadbf4e4ff617f133bd 
--revision=1b352eecb83da8e3214eb39c7e63624e3ae686e6
----------------------------------------------------------------------