[Monotone-commits-nodiffs] Revision bae0f1add053fae77e16d857bafefd0d0adffbfc

[monotone]

-----------------------------------------------------------------
Revision: bae0f1add053fae77e16d857bafefd0d0adffbfc
Ancestor: b89ed121fb95f644f04405174cb79d7ab8f8e386
Author: address@hidden
Date: 2007-02-08T02:38:37
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/two_parent_workspace_add_drop/__driver__.lua
Added directories:
        tests/two_parent_workspace_add_drop
Modified files:
        ChangeLog testsuite.lua work.cc

ChangeLog: 

2007-02-07  Matthew Gregan  <address@hidden>

        * work.cc (workspace::perform_additions,
        workspace::perform_deletions): Update to deal with multi-parent
        workspaces.
        * tests/two_parent_workspace_add_drop: New test.
        * testsuite.lua: Add it.


monotone --db={your.database} diff 
--revision=b89ed121fb95f644f04405174cb79d7ab8f8e386 
--revision=bae0f1add053fae77e16d857bafefd0d0adffbfc
----------------------------------------------------------------------