[Monotone-commits-diffs] Revision 4edf0f0b338a68d7f03dbe645487f1758730d6d4

[monotone]

-----------------------------------------------------------------
Revision: 4edf0f0b338a68d7f03dbe645487f1758730d6d4
Ancestor: 20f6960c8e3c5b3e966b0da75c129759675525ae
Ancestor: e3d2b8d07ab5b1743acf03aa8ac7116661481401
Author: address@hidden
Date: 2007-02-09T22:36:33
Branch: net.venge.monotone.workspace-merge.noconflict

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/two_parent_workspace_inodeprints/__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/two_parent_workspace_inodeprints
        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:
        ChangeLog tests/workspace_migration/__driver__.lua
        testsuite.lua work.cc

ChangeLog: 

merge of '20f6960c8e3c5b3e966b0da75c129759675525ae'
     and 'e3d2b8d07ab5b1743acf03aa8ac7116661481401'


monotone --db={your.database} diff 
--revision=20f6960c8e3c5b3e966b0da75c129759675525ae 
--revision=4edf0f0b338a68d7f03dbe645487f1758730d6d4
monotone --db={your.database} diff 
--revision=e3d2b8d07ab5b1743acf03aa8ac7116661481401 
--revision=4edf0f0b338a68d7f03dbe645487f1758730d6d4
----------------------------------------------------------------------