[Monotone-commits-nodiffs] Revision 57f949b1c893e4a786eae11a54af2e72d8b90002

[monotone]

-----------------------------------------------------------------
Revision: 57f949b1c893e4a786eae11a54af2e72d8b90002
Ancestor: 1a8afa25119c9c88dfd031c7fd834f6f99507ecf
Ancestor: 41991a101bd07e5911da751b0a2043996847add1
Author: Timothy Brownawell  <address@hidden>
Date: 1969-12-20T23:21:01
Branch: net.venge.monotone.error-handling

Added files:
        origin_type.hh
        tests/noop_merge_into_workspace/__driver__.lua
Added directories:
        tests/noop_merge_into_workspace
Modified files:
        Makefile.am annotate.cc asciik.cc automate.cc basic_io.cc
        basic_io.hh cert.cc cert.hh charset.cc charset.hh cmd.hh
        cmd_automate.cc cmd_conflicts.cc cmd_db.cc cmd_diff_log.cc
        cmd_files.cc cmd_key_cert.cc cmd_list.cc cmd_merging.cc
        cmd_netsync.cc cmd_othervcs.cc cmd_packet.cc
        cmd_ws_commit.cc commands.cc crypto_tests.cc cset.cc
        database.cc database_check.cc dates.cc diff_patch.cc
        epoch.cc file_io.cc globish.cc globish.hh graph.cc
        inodeprint.cc key_store.cc keys.cc legacy.cc lua.cc lua.hh
        lua_hooks.cc lua_hooks.hh luaext_globish.cc
        luaext_guess_binary.cc luaext_mkstemp.cc
        luaext_parse_basic_io.cc luaext_platform.cc merge.cc
        merkle_tree.cc monotone.cc monotone.texi mt_version.cc
        netcmd.cc netsync.cc netxx_pipe.cc option.cc option.hh
        options_list.hh packet.cc paths.cc paths.hh pcrewrap.cc
        pcrewrap.hh project.cc rcs_import.cc refiner.cc
        restrictions.cc revision.cc roster.cc roster_delta.cc
        roster_merge.cc safe_map.hh sanity.cc sanity.hh
        schema_migration.cc selectors.cc sha1.cc
        simplestring_xform.hh ssh_agent.cc std_hooks.lua tester.cc
        tests/commit_validation_lua_hook/__driver__.lua
        tests/resolve_conflicts_errors/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        transforms.cc transforms.hh ui.cc ui.hh unix/fs.cc
        unix/process.cc unix/ssh_agent_platform.cc
        unix/tester-plaf.cc uri.cc uri.hh vocab.cc vocab_cast.hh
        vocab_macros.hh work.cc work_migration.cc xdelta.cc

ChangeLog: 

Merge in mainline changes.


monotone --db={your.database} diff 
--revision=1a8afa25119c9c88dfd031c7fd834f6f99507ecf 
--revision=57f949b1c893e4a786eae11a54af2e72d8b90002
monotone --db={your.database} diff 
--revision=41991a101bd07e5911da751b0a2043996847add1 
--revision=57f949b1c893e4a786eae11a54af2e72d8b90002
----------------------------------------------------------------------