[Monotone-commits-nodiffs] Revision 94197607402e6f0e3f8e03a571dd4dfe15b0d815

[monotone]

-----------------------------------------------------------------
Revision: 94197607402e6f0e3f8e03a571dd4dfe15b0d815
Ancestor: 20dc4c08c24018f73aef0cbd35d1aea97c283e41
Ancestor: a4d933839cdfcffca7359101b735d53f3c1c175f
Author: address@hidden
Date: 2007-02-11T23:39:58
Branch: net.venge.monotone

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:
        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/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/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/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 app_state.cc automate.cc basic_io.cc basic_io.hh
        cert.cc cert.hh charset.cc charset.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
        database.cc database.hh database_check.cc diff_patch.cc
        diff_patch.hh inodeprint.cc keys.cc lcs.cc merkle_tree.cc
        monotone.cc monotone.texi packet.cc paths.cc 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/common/cvs.lua
        tests/empty_environment/__driver__.lua
        tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua
        tests/fail_cleanly_on_unreadable_db/__driver__.lua
        tests/restrictions_with_renames_and_adds/__driver__.lua
        tests/workspace_migration/__driver__.lua unix/fs.cc vocab.cc
        work.cc work.hh

ChangeLog: 

merge of '20dc4c08c24018f73aef0cbd35d1aea97c283e41'
     and 'a4d933839cdfcffca7359101b735d53f3c1c175f'


monotone --db={your.database} diff 
--revision=20dc4c08c24018f73aef0cbd35d1aea97c283e41 
--revision=94197607402e6f0e3f8e03a571dd4dfe15b0d815
monotone --db={your.database} diff 
--revision=a4d933839cdfcffca7359101b735d53f3c1c175f 
--revision=94197607402e6f0e3f8e03a571dd4dfe15b0d815
----------------------------------------------------------------------