[Monotone-commits-diffs] Revision 3105412040fc652d8469a130e165e8dc11db65cb

[monotone]

-----------------------------------------------------------------
Revision: 3105412040fc652d8469a130e165e8dc11db65cb
Ancestor: 875f4ccdc92483208affcb47e5b3f1dc50e1d610
Ancestor: cca53a50f3a89c0b6cea74442203cdeb53451eb6
Author: address@hidden
Date: 2007-02-07T21:16:29
Branch: net.venge.monotone.workspace-merge.noconflict

Renamed entries:
        tests/drop_directory_with_unversioned_files_and_merge to 
tests/drop_directory_with_unversioned_files_and_update
Added files:
        tests/merge_into_workspace/__driver__.lua
        tests/merge_into_workspace/dont_merge
        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
Added directories:
        tests/merge_into_workspace
        tests/merge_into_workspace_attr_corpse
        tests/merge_into_workspace_files_added
        tests/merge_into_workspace_no_changes
Modified files:
        ChangeLog NEWS automate.cc cert.cc cert.hh cmd_merging.cc
        cmd_ws_commit.cc database.hh database_check.cc
        restrictions.cc restrictions.hh revision.cc revision.hh
        roster.cc roster.hh roster_merge.cc
        tests/(imp)_deleting_directories/__driver__.lua
        tests/annotate_file_whose_name_changed/__driver__.lua
        tests/drop_directory_with_unversioned_files_and_update/__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/merging_a_rename_twice/__driver__.lua
        tests/merging_adds/__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_with_rosterify/__driver__.lua
        tests/test_a_merge_7/__driver__.lua
        tests/update_clobbers_workspace/__driver__.lua
        tests/update_does_not_stomp_non-monotone_files/__driver__.lua
        testsuite.lua work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
cca53a50f3a89c0b6cea74442203cdeb53451eb6)
            to branch 'net.venge.monotone.workspace-merge.noconflict' (head 
875f4ccdc92483208affcb47e5b3f1dc50e1d610)


monotone --db={your.database} diff 
--revision=875f4ccdc92483208affcb47e5b3f1dc50e1d610 
--revision=3105412040fc652d8469a130e165e8dc11db65cb
monotone --db={your.database} diff 
--revision=cca53a50f3a89c0b6cea74442203cdeb53451eb6 
--revision=3105412040fc652d8469a130e165e8dc11db65cb
----------------------------------------------------------------------