[Monotone-commits-diffs] Revision ce1e48b50aecf7c8dde28f24f9f0e94595e3d8bc

[monotone]

-----------------------------------------------------------------
Revision: ce1e48b50aecf7c8dde28f24f9f0e94595e3d8bc
Ancestor: 5593bf6f6e10ded80806125e2d826c290a88ab9b
Ancestor: df0d73c8cba28296a6bdd27beae5e91ccfdb8f54
Author: Timothy Brownawell  <address@hidden>
Date: 2006-05-28T11:45:31
Branch: net.venge.monotone.lua-testsuite

Renamed entries:
        tests/calculation_of_incorrect_unidiffs to 
tests/calculation_of_other_unidiffs
Added files:
        README.visualc8 boost/format/feed_args.hpp boost/format.hpp
        netxx_pipe.cc netxx_pipe.hh
        tests/creating_a_bad_criss-cross_merge/__driver__.lua
        tests/creating_a_bad_criss-cross_merge/alice.lua
        tests/creating_a_bad_criss-cross_merge/bob.lua
        tests/external_unit_test_of_the_line_merger/__driver__.lua
        tests/external_unit_test_of_the_line_merger/ancestor
        tests/external_unit_test_of_the_line_merger/left
        tests/external_unit_test_of_the_line_merger/right
        tests/importing_CVS_files/__driver__.lua
        tests/importing_files_with_non-english_names/__driver__.lua
        tests/renaming_a_directory/__driver__.lua
        tests/renaming_a_file/__driver__.lua
        tests/renaming_and_editing_a_file/__driver__.lua
        tests/t_invalid_root.at tests/t_netsync_pipe.at
        unix/os_strerror.cc uri.cc uri.hh visualc/config.h
        visualc/cryptopp.vcproj visualc/lua.vcproj
        visualc/monotone.sln visualc/monotone.vcproj
        visualc/mt-stdint.h visualc/netxx.vcproj visualc/popt.vcproj
        visualc/sqlite3.vcproj visualc/stdint.h
        visualc/stringprep.vcproj visualc/txt2c.vcproj
        visualc/unistd.h visualc/unknown_package.txt
        win32/os_strerror.cc
Added directories:
        boost/format tests/creating_a_bad_criss-cross_merge
        tests/external_unit_test_of_the_line_merger
        tests/importing_CVS_files
        tests/importing_files_with_non-english_names
        tests/renaming_a_directory tests/renaming_a_file
        tests/renaming_and_editing_a_file visualc
Modified files:
        ChangeLog Makefile.am annotate.cc app_state.cc app_state.hh
        automate.cc automate.hh basic_io.cc botan/config.h cert.cc
        cert.hh charset.cc cmd_automate.cc cmd_db.cc cmd_diff_log.cc
        cmd_list.cc cmd_merging.cc cmd_netsync.cc cmd_packet.cc
        cmd_ws_commit.cc commands.cc commands.hh configure.ac
        constants.cc constants.hh crypto_tests.cc cset.cc
        database.cc database.hh database_check.cc diff_patch.cc
        diff_patch.hh enumerator.cc epoch.cc file_io.cc globish.cc
        hash_map.hh hmac.cc hmac.hh idna/idna.c inodeprint.cc
        key_store.cc key_store.hh keys.cc keys.hh lcs.cc legacy.cc
        legacy.hh localized_file_io.hh lua.cc lua_hooks.cc
        lua_hooks.hh main.cc merge.cc merkle_tree.cc merkle_tree.hh
        mkstemp.cc monotone.cc monotone.texi mt_version.cc netcmd.cc
        netio.hh netsync.cc netxx/accept.cxx netxx/datagram.cxx
        netxx/osutil.cxx netxx/osutil.h netxx/peer.cxx netxx/probe.h
        netxx/probe_select.cxx netxx/recvfrom.cxx
        netxx/resolve_gethostbyname.cxx netxx/serverbase.cxx
        netxx/socket.cxx netxx/sockopt.cxx netxx/streambase.cxx
        netxx/streamserver.cxx options.hh packet.cc paths.cc
        paths.hh pch.hh platform.hh po/it.po po/sv.po popt/poptint.h
        popt/system.h rcs_file.cc rcs_import.cc refiner.cc
        revision.cc roster.cc roster.hh roster_merge.cc sanity.cc
        schema_migration.cc schema_migration.hh selectors.cc
        simplestring_xform.cc std_hooks.lua tester.cc tester.lua
        testsuite.at testsuite.lua transforms.cc transforms.hh ui.cc
        ui.hh unit_tests.cc unit_tests.hh unix/fs.cc unix/process.cc
        update.cc vocab.cc vocab.hh vocab_macros.hh vocab_terms.hh
        win32/fs.cc win32/get_system_flavour.cc win32/inodeprint.cc
        win32/process.cc work.cc xdelta.cc

ChangeLog: 

merge of 5593bf6f6e10ded80806125e2d826c290a88ab9b
     and df0d73c8cba28296a6bdd27beae5e91ccfdb8f54


monotone --db={your.database} diff 
--revision=5593bf6f6e10ded80806125e2d826c290a88ab9b 
--revision=ce1e48b50aecf7c8dde28f24f9f0e94595e3d8bc
monotone --db={your.database} diff 
--revision=df0d73c8cba28296a6bdd27beae5e91ccfdb8f54 
--revision=ce1e48b50aecf7c8dde28f24f9f0e94595e3d8bc
----------------------------------------------------------------------