[Monotone-commits-diffs] Revision ebe61c224d2d9f82b581785cf9daf1db2dd53817

[monotone]

-----------------------------------------------------------------
Revision: ebe61c224d2d9f82b581785cf9daf1db2dd53817
Ancestor: 1d723065f414aaae1471912ee077d0e75f646a5c
Ancestor: 950f63ff92b50f1fd54a3dc526c5ba4a913c5f40
Author: address@hidden
Date: 2007-02-07T18:53:46
Branch: net.venge.monotone.workspace-merge.noconflict

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 automate.cc 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/restrictions_with_renames_and_adds/__driver__.lua
        testsuite.lua win32/os_strerror.cc work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
950f63ff92b50f1fd54a3dc526c5ba4a913c5f40)
            to branch 'net.venge.monotone.workspace-merge.noconflict' (head 
1d723065f414aaae1471912ee077d0e75f646a5c)


monotone --db={your.database} diff 
--revision=1d723065f414aaae1471912ee077d0e75f646a5c 
--revision=ebe61c224d2d9f82b581785cf9daf1db2dd53817
monotone --db={your.database} diff 
--revision=950f63ff92b50f1fd54a3dc526c5ba4a913c5f40 
--revision=ebe61c224d2d9f82b581785cf9daf1db2dd53817
----------------------------------------------------------------------