[Monotone-commits-diffs] Revision a968648c47ecb7a837f3dc410122dd3956684364

[monotone]

-----------------------------------------------------------------
Revision: a968648c47ecb7a837f3dc410122dd3956684364
Ancestor: 1d16cdc6145395431e02b7f256d405e4c8730467
Ancestor: be015986dc352d71c9946e9ffefc45557304deff
Author: address@hidden
Date: 2007-02-24T14:17:33
Branch: net.venge.monotone

Deleted entries:
        contrib/mashschema.cc
        
tests/schema_migration/2881277287f6ee9bfc5ee255a503a6dc20dd5994.mtn.dumped
Added files:
        contrib/recreate-manifest-tables.sh
        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
        
tests/schema_migration/fe48b0804e0048b87b4cea51b3ab338ba187bdc2.mtn.dumped
        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:
        NEWS README.changesets UPGRADE annotate.cc app_state.cc
        asciik.cc automate.cc botan/libstate.cpp botan/mem_pool.cpp
        botan/mem_pool.h 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-import.pl
        contrib/monotone.bash_completion
        contrib/monotone.zsh_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 monotone.texi netcmd.cc netcmd.hh
        netsync.cc netsync.hh options_list.hh po/it.po po/sv.po
        project.cc project.hh rcs_import.cc revision.cc roster.cc
        roster_delta.cc roster_delta.hh schema.sql
        schema_migration.cc tester.cc tester.lua
        tests/_--author,_--date/__driver__.lua
        tests/files_with_intermediate__MTN_path_elements/__driver__.lua
        tests/import/__driver__.lua
        tests/listing_workspace_manifests/__driver__.lua
        tests/log_--brief/__driver__.lua
        tests/log_--diffs/__driver__.lua
        tests/log_--last=N_--next=N/__driver__.lua
        tests/log_--last=N_FILENAME/__driver__.lua
        tests/log_--no-files_and_--merges/__driver__.lua
        tests/log_dir/__driver__.lua
        tests/log_hides_deleted_renamed_files/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua
        tests/merge_into_workspace/__driver__.lua
        tests/merge_rename_file_and_rename_dir/__driver__.lua
        tests/rename_file_to_dir/__driver__.lua
        tests/rename_in_subdir/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_bad_schema/possible.dump
        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
Modified attrs:
        contrib/recreate-manifest-tables.sh

ChangeLog: 

merge of '1d16cdc6145395431e02b7f256d405e4c8730467'
     and 'be015986dc352d71c9946e9ffefc45557304deff'


monotone --db={your.database} diff 
--revision=1d16cdc6145395431e02b7f256d405e4c8730467 
--revision=a968648c47ecb7a837f3dc410122dd3956684364
monotone --db={your.database} diff 
--revision=be015986dc352d71c9946e9ffefc45557304deff 
--revision=a968648c47ecb7a837f3dc410122dd3956684364
----------------------------------------------------------------------