[Monotone-commits-nodiffs] Revision fab371cba3059245d5eca32853375a3ce4e5a369

[monotone]

-----------------------------------------------------------------
Revision: fab371cba3059245d5eca32853375a3ce4e5a369
Ancestor: 953470ec92a0f8b13cde384ce5b50a5622a4a14d
Ancestor: 9978630d8442e03b510d8d3c6ad38f666932fdf6
Author: address@hidden
Date: 2009-01-28T06:02:54
Branch: net.venge.monotone

Added files:
        origin_type.hh
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 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 po/sv.po
        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.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 win32/fs.cc win32/ssh_agent_platform.cc
        win32/tester-plaf.cc work.cc work_migration.cc xdelta.cc

ChangeLog: 

merge of '953470ec92a0f8b13cde384ce5b50a5622a4a14d'
     and '9978630d8442e03b510d8d3c6ad38f666932fdf6'


monotone --db={your.database} diff 
--revision=953470ec92a0f8b13cde384ce5b50a5622a4a14d 
--revision=fab371cba3059245d5eca32853375a3ce4e5a369
monotone --db={your.database} diff 
--revision=9978630d8442e03b510d8d3c6ad38f666932fdf6 
--revision=fab371cba3059245d5eca32853375a3ce4e5a369
----------------------------------------------------------------------