[Monotone-commits-diffs] Revision 1c823d7400275724d1c1c752eae184814fe403c6

[monotone]

-----------------------------------------------------------------
Revision: 1c823d7400275724d1c1c752eae184814fe403c6
Ancestor: 5de4d1e4d8e057d595df8025e85b61a59a9ced8a
Ancestor: e177090b6a0045efc774011fe3dc902245e35417
Author: address@hidden
Date: 2007-08-10T04:54:33
Branch: net.venge.monotone

Deleted entries:
        contrib/monotone-import.pl m4/ax_create_stdint_h.m4
        netsync.hh tests/common/cvs.lua
Renamed entries:
        tester.lua to testlib.lua
        tests/a_tricky_cvs_repository_with_tags to 
tests/importing_cvs_tricky_repo_with_tags
        tests/automate_attributes to tests/automate_get_attributes
        tests/cvs_import,_deleted_file_invariant to 
tests/importing_cvs_deleted_file
        tests/cvs_import,_file_dead_on_head_and_branch to 
tests/importing_cvs_file_dead_on_head_and_branch
        tests/cvs_import_with_file_added_on_a_branch to 
tests/importing_cvs_file_added_on_a_branch
        tests/importing_a_cvs_file_with_one_version to 
tests/importing_cvs_file_with_one_version
        tests/importing_a_small,_real_cvs_repository to 
tests/importing_cvs_small_real_repo
        tests/importing_cvs_branches_with_correct_ancestory to 
tests/importing_cvs_branches
        tests/test_problematic_cvs_import to 
tests/importing_cvs_problematic_repo
Added files:
        audit-includes base.hh contrib/Monotone.pm
        contrib/lua-mode.el
        contrib/monotone-buildbot-notification.lua
        contrib/monotone-cluster-push.lua
        contrib/monotone-log-of-pulled-revs-hook.lua
        contrib/monotone-mirror-postaction-push.sh
        contrib/monotone-mirror.lua contrib/mtn_makepermissions
        current_exception.hh dates.cc dates.hh
        debian/monotone.manpages debian/mtn.1 debian/po/cs.po
        debian/po/de.po debian/po/ja.po debian/po/nl.po
        debian/po/pt.po debian/po/sv.po examples/push.rc
        hybrid_map.hh lexical_cast.hh m4/iconv_translit.m4
        m4/numeric_vocab.m4 mac/monotone-pkg-logo.gif
        mac/monotone.pmproj mac/package-intro.rtf mac/readme-mac.txt
        specialized_lexical_cast.cc sqlite/btreeInt.h
        sqlite/limits.h sqlite/malloc.c sqlite/vdbeblob.c
        tests/automate_commands_are_not_completed/__driver__.lua
        tests/automate_identify/__driver__.lua
        tests/automate_roots/__driver__.lua
        tests/automate_set_drop_attribute/__driver__.lua
        tests/clone_-b_no_dir/__driver__.lua
        tests/clone_creates__MTN_log/__driver__.lua
        tests/clone_creates__MTN_log/commit_log.lua
        tests/clone_creates_right__MTN_options/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/defecting_attributes/__driver__.lua
        tests/diff_restriction_renamed_parent/__driver__.lua
        tests/drop_root/__driver__.lua
        tests/importing_cvs_branches/cvs-repository/test/changelog,v
        tests/importing_cvs_branches/cvs-repository/test/file1,v
        tests/importing_cvs_branches/cvs-repository/test/file2,v
        tests/importing_cvs_branches/makerepo.sh
        
tests/importing_cvs_file_added_on_a_branch/cvs-repository/test/Attic/bar,v
        tests/importing_cvs_file_added_on_a_branch/cvs-repository/test/foo,v
        tests/importing_cvs_file_added_on_a_branch/makerepo.sh
        tests/importing_cvs_file_with_one_version/cvs-repository/test/foo,v
        tests/importing_cvs_file_with_one_version/makerepo.sh
        tests/importing_cvs_files/cvs-repository/test/foo,v
        tests/importing_cvs_files/makerepo.sh
        tests/importing_cvs_files_with_identical_logs/cvs-repository/test/foo,v
        tests/importing_cvs_files_with_identical_logs/makerepo.sh
        
tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/changelog,v
        
tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/file1,v
        
tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/file2,v
        tests/importing_cvs_with_vendor_imports_and_branches/makerepo.sh
        tests/invoke_subcommands/__driver__.lua
        tests/invoke_toplevel_group/__driver__.lua
        tests/key_files_created_securely/__driver__.lua
        tests/keydir_defaults_to_under_confdir/__driver__.lua
        tests/netsync_key_hook/__driver__.lua
        tests/netsync_key_hook/client-hooks.lua
        tests/netsync_key_hook/read-permissions
        
tests/schema_migration/7ca81b45279403419581d7fde31ed888a80bd34e.mtn.dumped
        tests/server_initiated_sync/__driver__.lua
        tests/server_initiated_sync/server1.rc
        tests/test_a_merge_9/__driver__.lua
        tests/test_a_merge_9/left tests/test_a_merge_9/parent
        tests/test_a_merge_9/right
        tests/test_the_version_command/__driver__.lua
        visualc/runtests.bat visualc/unit_tests.vcproj vocab_hash.hh
        win32/monotone.bmp
Added directories:
        mac tests/automate_commands_are_not_completed
        tests/automate_identify tests/automate_roots
        tests/automate_set_drop_attribute tests/clone_-b_no_dir
        tests/clone_creates__MTN_log
        tests/clone_creates_right__MTN_options
        tests/clone_validates_target_directory
        tests/clone_warning_with_multiple_heads
        tests/defecting_attributes
        tests/diff_restriction_renamed_parent tests/drop_root
        tests/importing_cvs_branches/cvs-repository
        tests/importing_cvs_branches/cvs-repository/test
        tests/importing_cvs_file_added_on_a_branch/cvs-repository
        tests/importing_cvs_file_added_on_a_branch/cvs-repository/test
        tests/importing_cvs_file_added_on_a_branch/cvs-repository/test/Attic
        tests/importing_cvs_file_with_one_version/cvs-repository
        tests/importing_cvs_file_with_one_version/cvs-repository/test
        tests/importing_cvs_files/cvs-repository
        tests/importing_cvs_files/cvs-repository/test
        tests/importing_cvs_files_with_identical_logs/cvs-repository
        tests/importing_cvs_files_with_identical_logs/cvs-repository/test
        tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository
        tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test
        tests/invoke_subcommands tests/invoke_toplevel_group
        tests/key_files_created_securely
        tests/keydir_defaults_to_under_confdir
        tests/netsync_key_hook tests/server_initiated_sync
        tests/test_a_merge_9 tests/test_the_version_command
Modified files:
        AUTHORS HACKING INSTALL Makefile.am NEWS ROADMAP UPGRADE
        adler32.hh annotate.cc annotate.hh app_state.cc app_state.hh
        asciik.cc asciik.hh automate.cc basic_io.cc basic_io.hh
        botan/mem_pool.cpp botan/mem_pool.h cert.cc cert.hh
        charset.cc cmd.hh cmd_automate.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 commands.hh configure.ac
        constants.cc constants.hh contrib/README
        contrib/ext_hooks_expand.pl
        contrib/monotone-mirror-postaction-update.sh
        contrib/monotone-mirror.sh contrib/monotone-notify.pl
        contrib/monotone.bash_completion contrib/monotone.el
        contrib/monotone.zsh_completion contrib/mtbrowse.sh
        contrib/usher.cc crypto_tests.cc cset.cc cset.hh database.cc
        database.hh database_check.cc database_check.hh
        debian/changelog debian/control debian/copyright
        debian/monotone-server.postinst
        debian/monotone-server.postrm debian/po/fr.po debian/rules
        debian/watch diff_patch.cc diff_patch.hh enumerator.cc
        enumerator.hh epoch.cc epoch.hh file_io.cc file_io.hh
        globish.cc globish.hh graph.cc graph.hh hash_map.hh hmac.cc
        hmac.hh idna/idn-int.h idna/stringprep.h idna/toutf8.c
        inodeprint.cc interner.hh key_store.cc key_store.hh keys.cc
        keys.hh lcs.cc legacy.cc legacy.hh lua/lbaselib.cc
        lua/lcode.cc lua/ldebug.cc lua/lfunc.cc lua/loadlib.cc
        lua/loslib.cc lua/lparser.cc lua/lstrlib.cc lua/lua.h
        lua/luaconf.h lua/lvm.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 m4/boost.m4 m4/sqlite.m4 merge.cc
        merge.hh merkle_tree.cc merkle_tree.hh mkstemp.cc mkstemp.hh
        monotone.cc monotone.spec monotone.texi mt_version.cc
        mt_version.hh mtn-sanity.cc netcmd.cc netcmd.hh netsync.cc
        netxx/probe_select.cxx netxx_pipe.cc netxx_pipe.hh
        numeric_vocab.cc numeric_vocab.hh option.cc option.hh
        options.cc options.hh options_list.hh outdated_indicator.cc
        packet.cc packet.hh parallel_iter.hh paths.cc paths.hh
        pch.hh platform-wrapped.hh platform.hh po/POTFILES.in
        po/README po/de.po po/es.po po/fr.po po/it.po po/ja.po
        po/pt_BR.po po/sv.po project.cc project.hh randomfile.hh
        randomizer.cc randomizer.hh rcs_file.cc rcs_file.hh
        rcs_import.cc refiner.cc refiner.hh restrictions.cc
        restrictions.hh rev_height.cc rev_height.hh revision.cc
        revision.hh roster.cc roster.hh roster_delta.cc
        roster_merge.cc roster_merge.hh safe_map.hh sanity.cc
        sanity.hh schema.sql schema_migration.cc schema_migration.hh
        selectors.cc selectors.hh sha1.cc sha1_engine.hh
        simplestring_xform.cc simplestring_xform.hh sqlite/alter.c
        sqlite/analyze.c sqlite/attach.c sqlite/auth.c
        sqlite/btree.c sqlite/btree.h sqlite/build.c
        sqlite/callback.c sqlite/date.c sqlite/delete.c
        sqlite/expr.c sqlite/func.c sqlite/hash.c sqlite/insert.c
        sqlite/keywordhash.h sqlite/legacy.c sqlite/loadext.c
        sqlite/main.c sqlite/opcodes.c sqlite/opcodes.h sqlite/os.c
        sqlite/os.h sqlite/os_common.h sqlite/os_os2.c
        sqlite/os_unix.c sqlite/os_win.c sqlite/pager.c
        sqlite/pager.h sqlite/parse.c sqlite/parse.h sqlite/pragma.c
        sqlite/prepare.c sqlite/printf.c sqlite/select.c
        sqlite/sqlite3.h sqlite/sqlite3ext.h sqlite/sqliteInt.h
        sqlite/table.c sqlite/tokenize.c sqlite/trigger.c
        sqlite/update.c sqlite/utf.c sqlite/util.c sqlite/vacuum.c
        sqlite/vdbe.c sqlite/vdbe.h sqlite/vdbeInt.h
        sqlite/vdbeapi.c sqlite/vdbeaux.c sqlite/vdbefifo.c
        sqlite/vdbemem.c sqlite/vtab.c sqlite/where.c ssh_agent.cc
        ssh_agent.hh std_hooks.lua string_queue.cc string_queue.hh
        tester.cc tests/automate_get_attributes/__driver__.lua
        tests/automate_put_revision_unknown_file/__driver__.lua
        tests/changing_passphrase_of_a_private_key/__driver__.lua
        tests/check_that_--xargs_and_-(at)_behave_correctly/__driver__.lua
        tests/command_completion/__driver__.lua
        tests/common/netsync.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/exchanging_work_via_netsync,_with_notes/testnotes.test
        tests/importing_cvs_branches/__driver__.lua
        tests/importing_cvs_file_added_on_a_branch/__driver__.lua
        tests/importing_cvs_file_with_one_version/__driver__.lua
        tests/importing_cvs_files/__driver__.lua
        tests/importing_cvs_files_with_identical_logs/__driver__.lua
        tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua
        tests/invalid_--root_settings/__driver__.lua
        tests/key_management_without_a_database/__driver__.lua
        tests/listing_changed_files/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/netsync,--set-default/__driver__.lua
        tests/netsync_permissions_wildcards/__driver__.lua
        tests/netsync_verifies_server_keys/__driver__.lua
        tests/rename_file_to_dir/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_error_recovery/__driver__.lua
        tests/ssh_agent/__driver__.lua
        tests/test_the_help_command/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/usage_output_streams/__driver__.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua
        testsuite.lua transforms.cc transforms.hh txt2c.cc ui.cc
        ui.hh unit_tests.cc unit_tests.hh unix/cputime.cc unix/fs.cc
        unix/get_system_flavour.cc unix/inodeprint.cc unix/main.cc
        unix/os_strerror.cc unix/process.cc unix/read_password.cc
        unix/ssh_agent_platform.cc unix/ssh_agent_platform.hh
        unix/terminal.cc update.cc update.hh uri.cc uri.hh
        visualc/botan.vcproj visualc/config.h visualc/lua.vcproj
        visualc/monotone.sln visualc/monotone.vcproj
        visualc/netxx.vcproj visualc/sqlite3.vcproj
        visualc/tester.vcproj visualc/txt2c.vcproj vocab.cc vocab.hh
        vocab_macros.hh vocab_terms.hh win32/cputime.cc win32/fs.cc
        win32/get_system_flavour.cc win32/inodeprint.cc
        win32/main.cc win32/make_io_binary.cc win32/monotone.iss
        win32/os_strerror.cc win32/process.cc win32/read_password.cc
        win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
        win32/terminal.cc work.cc work.hh work_migration.cc
        xdelta.cc xdelta.hh
Modified attrs:
        contrib/monotone-mirror-postaction-push.sh
        mac/monotone-pkg-logo.gif
        tests/importing_cvs_branches/makerepo.sh
        tests/importing_cvs_file_added_on_a_branch/makerepo.sh
        tests/importing_cvs_file_with_one_version/makerepo.sh
        tests/importing_cvs_files/makerepo.sh
        tests/importing_cvs_files_with_identical_logs/makerepo.sh
        tests/importing_cvs_with_vendor_imports_and_branches/makerepo.sh
        win32/monotone.bmp

ChangeLog: 

merge of '5de4d1e4d8e057d595df8025e85b61a59a9ced8a'
     and 'e177090b6a0045efc774011fe3dc902245e35417'


monotone --db={your.database} diff 
--revision=5de4d1e4d8e057d595df8025e85b61a59a9ced8a 
--revision=1c823d7400275724d1c1c752eae184814fe403c6
monotone --db={your.database} diff 
--revision=e177090b6a0045efc774011fe3dc902245e35417 
--revision=1c823d7400275724d1c1c752eae184814fe403c6
----------------------------------------------------------------------