[Monotone-commits-diffs] Revision da8f5136f3561dcd2e8391c98ca4251d4a24bc78

[monotone]

-----------------------------------------------------------------
Revision: da8f5136f3561dcd2e8391c98ca4251d4a24bc78
Ancestor: 7de83a6dd9437aaad4ef37c653148f195016fe0a
Ancestor: 9cdbe3f4051d5c91baa99c56f9d60dd23580b0ce
Author: address@hidden
Date: 2007-02-09T21:02:50
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/merge_into_workspace/expected-log
        tests/merge_into_workspace/expected-log-left
        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_inodeprints/__driver__.lua
Added directories:
        tests/two_parent_workspace_annotate
        tests/two_parent_workspace_inodeprints
Modified files:
        ChangeLog automate.cc cmd_diff_log.cc cmd_files.cc
        tests/merge_into_workspace/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        testsuite.lua work.cc

ChangeLog: 

merge of '7de83a6dd9437aaad4ef37c653148f195016fe0a'
     and '9cdbe3f4051d5c91baa99c56f9d60dd23580b0ce'


monotone --db={your.database} diff 
--revision=7de83a6dd9437aaad4ef37c653148f195016fe0a 
--revision=da8f5136f3561dcd2e8391c98ca4251d4a24bc78
monotone --db={your.database} diff 
--revision=9cdbe3f4051d5c91baa99c56f9d60dd23580b0ce 
--revision=da8f5136f3561dcd2e8391c98ca4251d4a24bc78
----------------------------------------------------------------------