[Monotone-commits-diffs] Revision 0f6fb911234799fb040d9605a141e28f3f51e854

[monotone]

-----------------------------------------------------------------
Revision: 0f6fb911234799fb040d9605a141e28f3f51e854
Ancestor: 65b7520bbc9672d96246661e72819392e00b3ec4
Ancestor: 8a00f0d936ed2a52ce9ceed423a65e0e87134d61
Author: Timothy Brownawell  <address@hidden>
Date: 2007-02-22T01:51:15
Branch: net.venge.monotone

Deleted entries:
        contrib/mashschema.cc
        
tests/schema_migration/2881277287f6ee9bfc5ee255a503a6dc20dd5994.mtn.dumped
Added files:
        contrib/recreate-manifest-tables.sh
        tests/rename_in_new_workspace/__driver__.lua
        
tests/schema_migration/fe48b0804e0048b87b4cea51b3ab338ba187bdc2.mtn.dumped
        vocab_cast.hh
Added directories:
        tests/rename_in_new_workspace
Modified files:
        README.changesets 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 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 schema.sql schema_migration.cc
        tests/rename_file_to_dir/__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 '65b7520bbc9672d96246661e72819392e00b3ec4'
     and '8a00f0d936ed2a52ce9ceed423a65e0e87134d61'


monotone --db={your.database} diff 
--revision=65b7520bbc9672d96246661e72819392e00b3ec4 
--revision=0f6fb911234799fb040d9605a141e28f3f51e854
monotone --db={your.database} diff 
--revision=8a00f0d936ed2a52ce9ceed423a65e0e87134d61 
--revision=0f6fb911234799fb040d9605a141e28f3f51e854
----------------------------------------------------------------------