[Monotone-commits-diffs] Revision 22203f55fc67e238df1ccb7b8f26b68dc6c3c58a

[monotone]

-----------------------------------------------------------------
Revision: 22203f55fc67e238df1ccb7b8f26b68dc6c3c58a
Ancestor: 7f8584487a019fab9432f21f3d16825214468e1d
Author: address@hidden
Date: 2007-02-09T19:41:36
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/merge_into_workspace/expected-log
        tests/merge_into_workspace/expected-log-left
Modified files:
        ChangeLog cmd_diff_log.cc
        tests/merge_into_workspace/__driver__.lua

ChangeLog: 

        * cmd_files.cc (log): Work in a two-parent workspace.
        * tests/merge_into_workspace: Augment with tests for log.
        * cmd_files.cc (annotate): Handle multi-parent workspaces gracefully.
        Add lengthy comment about why multi-parent annotate doesn't work.
        * tests/two_parent_workspace_annotate: New xfailed test.
        * testsuite.lua: Update.

txtE5SmYRBVXL.txt
Description: Diff [7f8584487a019fab9432f21f3d16825214468e1d] -> [22203f55fc67e238df1ccb7b8f26b68dc6c3c58a]