[Monotone-commits-diffs] Revision 9cdbe3f4051d5c91baa99c56f9d60dd23580b0ce

[monotone]

-----------------------------------------------------------------
Revision: 9cdbe3f4051d5c91baa99c56f9d60dd23580b0ce
Ancestor: 22203f55fc67e238df1ccb7b8f26b68dc6c3c58a
Author: address@hidden
Date: 2007-02-09T20:11:20
Branch: net.venge.monotone.workspace-merge.noconflict

Modified files:
        ChangeLog automate.cc
        tests/two_parent_workspace_commands_that_fail/__driver__.lua

ChangeLog: 

        * automate.cc (attributes): Fail gracefully in a two-parent workspace.
        * tests/two_parent_workspace_commands_that_fail: Add test for
        automate attributes.

txtSPeEZDf9wh.txt
Description: Diff [22203f55fc67e238df1ccb7b8f26b68dc6c3c58a] -> [9cdbe3f4051d5c91baa99c56f9d60dd23580b0ce]