[Monotone-commits-diffs] Revision 39a06f280cd934bb8a608d98b32f9734f8c04e5f

[monotone]

-----------------------------------------------------------------
Revision: 39a06f280cd934bb8a608d98b32f9734f8c04e5f
Ancestor: b99f93d025cf3b7a86d3114531075eae8bb7eb4c
Author: address@hidden
Date: 2007-02-08T05:43:03
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/two_parent_workspace_attrs/__driver__.lua
Added directories:
        tests/two_parent_workspace_attrs
Modified files:
        ChangeLog cmd_ws_commit.cc
        tests/two_parent_workspace_pluck/__driver__.lua
        testsuite.lua

ChangeLog: 

        * cmd_ws_commit.cc (attr): Work in a two-parent workspace.
        * tests/two_parent_workspace_attrs: New test.
        * tests/two_parent_workspace_pluck: Make sure we can commit the
        result of our manipulations.

txtJjP0txiL88.txt
Description: Diff [b99f93d025cf3b7a86d3114531075eae8bb7eb4c] -> [39a06f280cd934bb8a608d98b32f9734f8c04e5f]