[Monotone-commits-diffs] Revision b99f93d025cf3b7a86d3114531075eae8bb7eb4c

[monotone]

-----------------------------------------------------------------
Revision: b99f93d025cf3b7a86d3114531075eae8bb7eb4c
Ancestor: b89ed121fb95f644f04405174cb79d7ab8f8e386
Author: address@hidden
Date: 2007-02-08T02:10:05
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/merge_into_workspace/expected-manifest
Modified files:
        ChangeLog automate.cc
        tests/merge_into_workspace/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua

ChangeLog: 

        * automate.cc (inventory, get_base_revision_id): Fail gracefully
        in a two-parent workspace.
        (get_current_revision_id, get_manifest_of): Work in a two-parent
        workspace.
        * tests/merge_into_workspace: Test new behavior of automate
        get_current_revision_id and get_manifest-of.
        * tests/two_parent_workspace_commands_that_fail: Un-xfail.

txt4WdX10D82A.txt
Description: Diff [b89ed121fb95f644f04405174cb79d7ab8f8e386] -> [b99f93d025cf3b7a86d3114531075eae8bb7eb4c]