[Monotone-commits-diffs] Revision 27bee93435181fc8d494009b0e5574e0b94cec16

[monotone]

-----------------------------------------------------------------
Revision: 27bee93435181fc8d494009b0e5574e0b94cec16
Ancestor: 4ac5f3b81a216a59f8c0a739176bebd6023a379e
Ancestor: b2049e9990e0bf47d0d1f3c0e1fd6e0b26fccf55
Author: address@hidden
Date: 2007-02-11T02:08:28
Branch: net.venge.monotone.workspace-merge.noconflict

Deleted entries:
        ChangeLog
Added files:
        tests/two_parent_workspace_inodeprint_from_birth/__driver__.lua
Added directories:
        tests/two_parent_workspace_inodeprint_from_birth
Modified files:
        cmd_list.cc cmd_ws_commit.cc po/sv.po revision.cc
        revision.hh
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/two_parent_workspace_inodeprints/__driver__.lua
        testsuite.lua

ChangeLog: 

merge of '4ac5f3b81a216a59f8c0a739176bebd6023a379e'
     and 'b2049e9990e0bf47d0d1f3c0e1fd6e0b26fccf55'


monotone --db={your.database} diff 
--revision=4ac5f3b81a216a59f8c0a739176bebd6023a379e 
--revision=27bee93435181fc8d494009b0e5574e0b94cec16
monotone --db={your.database} diff 
--revision=b2049e9990e0bf47d0d1f3c0e1fd6e0b26fccf55 
--revision=27bee93435181fc8d494009b0e5574e0b94cec16
----------------------------------------------------------------------