[Monotone-commits-diffs] Revision 249edbfd2efe1f3baf5d814e35416f6071d4f0d1

[monotone]

-----------------------------------------------------------------
Revision: 249edbfd2efe1f3baf5d814e35416f6071d4f0d1
Ancestor: 8f901bf757df7f61fefefb35b2ffd5abe3a68e9f
Ancestor: d268327a82eed2aae414fba1a5eecad4cb7de954
Author: address@hidden
Date: 2007-02-21T16:46:02
Branch: net.venge.monotone

Deleted entries:
        ChangeLog contrib/mashschema.cc localized_file_io.cc
        localized_file_io.hh mtn.1 tests/files_with_non-utf8_data
        tests/files_with_non-utf8_data/8859-5.lua
        tests/files_with_non-utf8_data/__driver__.lua
        tests/files_with_non-utf8_data/euc.lua
        tests/files_with_non-utf8_data/jp-euc
        tests/files_with_non-utf8_data/jp-utf8
        tests/files_with_non-utf8_data/ru-8859-5
        tests/files_with_non-utf8_data/ru-utf8
        
tests/schema_migration/2881277287f6ee9bfc5ee255a503a6dc20dd5994.mtn.dumped
        tests/use_get_linesep_conv_hook
        tests/use_get_linesep_conv_hook/__driver__.lua
        tests/use_get_linesep_conv_hook/linesep.lua
Renamed entries:
        tests/checkout_clobbers_workspace to 
tests/checkout_does_not_clobber_workspace
        tests/drop_directory_with_unversioned_files_and_merge to 
tests/drop_directory_with_unversioned_files_and_update
        tests/update_clobbers_workspace to 
tests/update_does_not_clobber_workspace
        tests/workspace_migration/test-1 to tests/workspace_migration/basic-1
        tests/workspace_migration/test-2 to tests/workspace_migration/basic-2
Added files:
        ChangeLog asciik.cc asciik.hh
        contrib/monotone-run-script-post-netsync.lua
        contrib/recreate-manifest-tables.sh
        tests/db_kill_rev_and_recommit/__driver__.lua
        tests/locked_workspace/__driver__.lua
        tests/ls_unknown_in_subdir/__driver__.lua
        tests/magic__MTN_in_restrictions/__driver__.lua
        tests/merge_into_workspace/__driver__.lua
        tests/merge_into_workspace/dont_merge
        tests/merge_into_workspace/expected-log
        tests/merge_into_workspace/expected-log-left
        tests/merge_into_workspace/expected-manifest
        tests/merge_into_workspace/left
        tests/merge_into_workspace/merged
        tests/merge_into_workspace/otherfile
        tests/merge_into_workspace/otherfile_mod
        tests/merge_into_workspace/right
        tests/merge_into_workspace/testfile
        tests/merge_into_workspace_attr_corpse/__driver__.lua
        tests/merge_into_workspace_attr_corpse/expected-roster
        tests/merge_into_workspace_attr_corpse/testfile
        tests/merge_into_workspace_files_added/__driver__.lua
        tests/merge_into_workspace_files_added/expected-revision
        tests/merge_into_workspace_files_added/left
        tests/merge_into_workspace_files_added/right
        tests/merge_into_workspace_files_added/testfile
        tests/merge_into_workspace_no_changes/__driver__.lua
        tests/merge_into_workspace_no_changes/left
        tests/merge_into_workspace_no_changes/right
        tests/merge_into_workspace_no_changes/testfile
        tests/merge_into_workspace_no_changes/unrelated
        tests/merge_into_workspace_same_rev/__driver__.lua
        tests/pluck_does_not_clobber_workspace/__driver__.lua
        tests/revert_the_middle_of_a_sequence/__driver__.lua
        
tests/schema_migration/fe48b0804e0048b87b4cea51b3ab338ba187bdc2.mtn.dumped
        tests/test_a_merge_8/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
        tests/two_parent_workspace_add_drop_rename/__driver__.lua
        tests/two_parent_workspace_annotate/__driver__.lua
        tests/two_parent_workspace_annotate/expected-annotation
        tests/two_parent_workspace_annotate/left
        tests/two_parent_workspace_annotate/merged
        tests/two_parent_workspace_annotate/right
        tests/two_parent_workspace_annotate/testfile
        tests/two_parent_workspace_attrs/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/two_parent_workspace_inodeprint_from_birth/__driver__.lua
        tests/two_parent_workspace_inodeprints/__driver__.lua
        tests/two_parent_workspace_list/__driver__.lua
        tests/two_parent_workspace_pivot_root/__driver__.lua
        tests/two_parent_workspace_pluck/__driver__.lua
        tests/workspace_migration/basic.lua
        tests/workspace_migration/inodeprints-1/_MTN/inodeprints
        tests/workspace_migration/inodeprints-1/_MTN/log
        tests/workspace_migration/inodeprints-1/_MTN/monotonerc
        tests/workspace_migration/inodeprints-1/_MTN/options
        tests/workspace_migration/inodeprints-1/_MTN/revision
        tests/workspace_migration/inodeprints-1/_MTN/work
        tests/workspace_migration/inodeprints-1/newdir/file3
        tests/workspace_migration/inodeprints-1/renamed-testfile2
        tests/workspace_migration/inodeprints-1/testfile1
        tests/workspace_migration/inodeprints-2/_MTN/format
        tests/workspace_migration/inodeprints-2/_MTN/inodeprints
        tests/workspace_migration/inodeprints-2/_MTN/log
        tests/workspace_migration/inodeprints-2/_MTN/monotonerc
        tests/workspace_migration/inodeprints-2/_MTN/options
        tests/workspace_migration/inodeprints-2/_MTN/revision
        tests/workspace_migration/inodeprints-2/newdir/file3
        tests/workspace_migration/inodeprints-2/renamed-testfile2
        tests/workspace_migration/inodeprints-2/testfile1
        tests/workspace_migration/inodeprints.lua
        tests/workspace_migration/twoparent-2/_MTN/format
        tests/workspace_migration/twoparent-2/_MTN/log
        tests/workspace_migration/twoparent-2/_MTN/monotonerc
        tests/workspace_migration/twoparent-2/_MTN/options
        tests/workspace_migration/twoparent-2/_MTN/revision
        tests/workspace_migration/twoparent-2/attrfile
        tests/workspace_migration/twoparent-2/testfile
        tests/workspace_migration/twoparent.lua
Added directories:
        tests/db_kill_rev_and_recommit tests/locked_workspace
        tests/ls_unknown_in_subdir tests/magic__MTN_in_restrictions
        tests/merge_into_workspace
        tests/merge_into_workspace_attr_corpse
        tests/merge_into_workspace_files_added
        tests/merge_into_workspace_no_changes
        tests/merge_into_workspace_same_rev
        tests/pluck_does_not_clobber_workspace
        tests/revert_the_middle_of_a_sequence tests/test_a_merge_8
        tests/two_parent_workspace_add_drop_rename
        tests/two_parent_workspace_annotate
        tests/two_parent_workspace_attrs
        tests/two_parent_workspace_commands_that_fail
        tests/two_parent_workspace_inodeprint_from_birth
        tests/two_parent_workspace_inodeprints
        tests/two_parent_workspace_list
        tests/two_parent_workspace_pivot_root
        tests/two_parent_workspace_pluck
        tests/workspace_migration/inodeprints-1
        tests/workspace_migration/inodeprints-1/_MTN
        tests/workspace_migration/inodeprints-1/newdir
        tests/workspace_migration/inodeprints-2
        tests/workspace_migration/inodeprints-2/_MTN
        tests/workspace_migration/inodeprints-2/newdir
        tests/workspace_migration/twoparent-2
        tests/workspace_migration/twoparent-2/_MTN
Modified files:
        HACKING INSTALL Makefile.am NEWS README.changesets UPGRADE
        annotate.cc app_state.cc automate.cc basic_io.cc basic_io.hh
        botan/ber_dec.cpp cert.cc cert.hh charset.cc charset.hh
        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_packet.cc cmd_ws_commit.cc commands.cc configure.ac
        constants.cc constants.hh contrib/README
        contrib/monotone-import.pl
        contrib/monotone-notify-hookversion.lua
        contrib/monotone-notify.pl contrib/monotone.el
        contrib/monotone.zsh_completion cset.cc database.cc
        database.hh database_check.cc debian/changelog
        debian/monotone-server.postinst diff_patch.cc diff_patch.hh
        file_io.cc file_io.hh inodeprint.cc keys.cc lcs.cc lua.cc
        lua_hooks.cc lua_hooks.hh luaext_globish.cc merkle_tree.cc
        monotone.cc monotone.texi netcmd.cc netio.hh netsync.cc
        option.cc options_list.hh packet.cc paths.cc paths.hh
        platform-wrapped.hh po/POTFILES.in 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 rcs_file.cc rcs_import.cc restrictions.cc
        restrictions.hh rev_height.cc rev_height.hh revision.cc
        revision.hh roster.cc roster.hh roster_merge.cc sanity.cc
        sanity.hh schema.sql schema_migration.cc sha1.cc
        simplestring_xform.cc simplestring_xform.hh smap.hh
        sqlite/btree.c sqlite/btree.h sqlite/loadext.c
        sqlite/os_win.c sqlite/parse.c sqlite/pragma.c
        sqlite/printf.c sqlite/select.c sqlite/sqlite3.h
        sqlite/sqliteInt.h sqlite/tokenize.c sqlite/vdbe.c
        sqlite/vdbeInt.h sqlite/where.c std_hooks.lua
        string_queue.cc tester.cc
        tests/(imp)_deleting_directories/__driver__.lua
        tests/(imp)_merge((patch_foo_a),_(delete_foo_))/__driver__.lua
        tests/_--author,_--date/__driver__.lua
        tests/_MTN_case-folding_security_patch/__driver__.lua
        tests/a_tricky_cvs_repository_with_tags/__driver__.lua
        tests/add_inside__MTN_/__driver__.lua
        tests/addition_of_files_and_directories/__driver__.lua
        tests/annotate_file_whose_name_changed/__driver__.lua
        tests/attr_command_in_subdirs/__driver__.lua
        tests/attr_set_get_commands/__driver__.lua
        tests/checkout_creates__MTN_log/__driver__.lua
        tests/checkout_does_not_clobber_workspace/__driver__.lua
        tests/common/cvs.lua
        tests/delete_work_file_on_checkout/__driver__.lua
        tests/diff_shows_renames/__driver__.lua
        tests/drop_directory_with_unversioned_files_and_update/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua
        tests/fail_cleanly_on_unreadable_db/__driver__.lua
        tests/import/__driver__.lua
        tests/importing_a_small,_real_cvs_repository/__driver__.lua
        tests/log_--brief/__driver__.lua
        tests/log_--diffs/__driver__.lua
        tests/log_--last=N_--next=N/__driver__.lua
        tests/log_--last=N_FILENAME/__driver__.lua
        tests/log_--no-files_and_--merges/__driver__.lua
        tests/log_dir/__driver__.lua
        tests/log_hides_deleted_renamed_files/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/ls_unknown_of_unknown_subdir/__driver__.lua
        tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua
        
tests/merge_a_project_into_a_subdirectory_of_an_unrelated_project/__driver__.lua
        tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua
        tests/merging_a_rename_twice/__driver__.lua
        tests/merging_adds/__driver__.lua
        tests/merging_an_add_edge/__driver__.lua
        tests/multiple_version_committing/__driver__.lua
        tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua
        tests/rename_dir_to_non-sibling/__driver__.lua
        tests/renaming_a_deleted_file/__driver__.lua
        tests/repeatedly_exchanging_work_via_netsync/__driver__.lua
        tests/restrictions_with_renames_and_adds/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_bad_schema/possible.dump
        tests/schema_migration_with_rosterify/__driver__.lua
        tests/selecting_arbitrary_certs/__driver__.lua
        tests/test_a_merge_7/__driver__.lua
        tests/test_annotate_command/__driver__.lua
        tests/things_in_.mtn-ignore_get_ignored/__driver__.lua
        tests/update_does_not_clobber_workspace/__driver__.lua
        tests/update_does_not_stomp_non-monotone_files/__driver__.lua
        tests/update_updates_inodeprints/__driver__.lua
        tests/workspace_migration/__driver__.lua testsuite.lua
        transforms.cc transforms.hh unix/fs.cc update.cc vocab.cc
        vocab.hh vocab_macros.hh win32/fs.cc win32/os_strerror.cc
        work.cc work.hh
Modified attrs:
        contrib/recreate-manifest-tables.sh

ChangeLog: 

merge of '8f901bf757df7f61fefefb35b2ffd5abe3a68e9f'
     and 'd268327a82eed2aae414fba1a5eecad4cb7de954'


monotone --db={your.database} diff 
--revision=8f901bf757df7f61fefefb35b2ffd5abe3a68e9f 
--revision=249edbfd2efe1f3baf5d814e35416f6071d4f0d1
monotone --db={your.database} diff 
--revision=d268327a82eed2aae414fba1a5eecad4cb7de954 
--revision=249edbfd2efe1f3baf5d814e35416f6071d4f0d1
----------------------------------------------------------------------