[Monotone-commits-nodiffs] Revision b371bf082168fd0a3cd9cffcb7ed4c906e35f2a3

[monotone]

-----------------------------------------------------------------
Revision: b371bf082168fd0a3cd9cffcb7ed4c906e35f2a3
Ancestor: aa1d0b32c68e1251f70627edffe70d070802457d
Ancestor: e32842e89ace29d539eb4fa7964f3efda1aee4aa
Author: address@hidden
Date: 2007-02-20T17:22:10
Branch: net.venge.monotone.experiment.summit07.win32-cleanups

Deleted entries:
        ChangeLog
Renamed entries:
        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 tests/locked_workspace/__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/rename_in_new_workspace/__driver__.lua
        tests/revert_the_middle_of_a_sequence/__driver__.lua
        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/locked_workspace 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/rename_in_new_workspace
        tests/revert_the_middle_of_a_sequence
        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 Makefile.am app_state.cc automate.cc basic_io.cc
        basic_io.hh 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
        contrib/monotone-notify-hookversion.lua database.cc
        database.hh database_check.cc diff_patch.cc diff_patch.hh
        do-editor-vars.sh file_io.cc inodeprint.cc keys.cc lcs.cc
        merkle_tree.cc monotone.cc monotone.texi netio.hh packet.cc
        paths.cc po/de.po po/it.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_migration.cc sha1.cc smap.hh 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/a_tricky_cvs_repository_with_tags/__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/empty_environment/__driver__.lua
        tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua
        tests/fail_cleanly_on_unreadable_db/__driver__.lua
        tests/importing_a_small,_real_cvs_repository/__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_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/rename_file_to_dir/__driver__.lua
        tests/restrictions_with_renames_and_adds/__driver__.lua
        tests/selecting_arbitrary_certs/__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/test_annotate_command/__driver__.lua
        tests/update_updates_inodeprints/__driver__.lua
        tests/workspace_migration/__driver__.lua testsuite.lua
        unix/cputime.cc unix/fs.cc unix/get_system_flavour.cc
        unix/inodeprint.cc unix/make_io_binary.cc
        unix/os_strerror.cc unix/process.cc unix/read_password.cc
        unix/terminal.cc vocab.cc vocab_macros.hh win32/cputime.cc
        win32/fs.cc win32/get_system_flavour.cc win32/inodeprint.cc
        win32/make_io_binary.cc win32/os_strerror.cc
        win32/process.cc win32/read_password.cc win32/terminal.cc
        work.cc work.hh

ChangeLog: 

merge of 'aa1d0b32c68e1251f70627edffe70d070802457d'
     and 'e32842e89ace29d539eb4fa7964f3efda1aee4aa'


monotone --db={your.database} diff 
--revision=aa1d0b32c68e1251f70627edffe70d070802457d 
--revision=b371bf082168fd0a3cd9cffcb7ed4c906e35f2a3
monotone --db={your.database} diff 
--revision=e32842e89ace29d539eb4fa7964f3efda1aee4aa 
--revision=b371bf082168fd0a3cd9cffcb7ed4c906e35f2a3
----------------------------------------------------------------------