[Monotone-commits-diffs] Revision 96ed05f006bf96d99ae730378cec88cf3631f072

[monotone]

-----------------------------------------------------------------
Revision: 96ed05f006bf96d99ae730378cec88cf3631f072
Ancestor: 834ce775629e8d87b83a7fadd2794439d0af82e9
Ancestor: 8c287c06d1147a031d6e48ea22d431e2f926efba
Author: Thomas Moschny <address@hidden>
Author: address@hidden
Author: address@hidden
Date: 2007-02-11T18:42:18
Date: 2007-02-11T18:43:48
Date: 2007-02-11T18:24:34
Branch: net.venge.monotone

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/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:
        automate.cc cert.cc cert.hh cmd.hh cmd_diff_log.cc
        cmd_files.cc cmd_list.cc cmd_merging.cc cmd_ws_commit.cc
        commands.cc database.cc database.hh database_check.cc
        monotone.texi po/de.po project.cc project.hh restrictions.cc
        restrictions.hh rev_height.cc rev_height.hh revision.cc
        revision.hh roster.cc roster.hh roster_merge.cc
        schema_migration.cc std_hooks.lua 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/restrictions_with_renames_and_adds/__driver__.lua
        tests/selecting_arbitrary_certs/__driver__.lua
        tests/test_annotate_command/__driver__.lua
        tests/update_updates_inodeprints/__driver__.lua
        tests/workspace_migration/__driver__.lua testsuite.lua
        unix/fs.cc work.cc work.hh

ChangeLog: 

merge of '834ce775629e8d87b83a7fadd2794439d0af82e9'
     and '8c287c06d1147a031d6e48ea22d431e2f926efba'


monotone --db={your.database} diff 
--revision=834ce775629e8d87b83a7fadd2794439d0af82e9 
--revision=96ed05f006bf96d99ae730378cec88cf3631f072
monotone --db={your.database} diff 
--revision=8c287c06d1147a031d6e48ea22d431e2f926efba 
--revision=96ed05f006bf96d99ae730378cec88cf3631f072
----------------------------------------------------------------------