[Monotone-commits-diffs] Revision 7f8584487a019fab9432f21f3d16825214468e1d

[monotone]

-----------------------------------------------------------------
Revision: 7f8584487a019fab9432f21f3d16825214468e1d
Ancestor: 8c54b8e93462de125b48a2c2af8adfcc8c919b93
Author: address@hidden
Date: 2007-02-09T18:22:18
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/two_parent_workspace_annotate/__driver__.lua
        tests/two_parent_workspace_annotate/expected-annotation
        tests/two_parent_workspace_annotate/left
        tests/two_parent_workspace_annotate/merged
        tests/two_parent_workspace_annotate/right
        tests/two_parent_workspace_annotate/testfile
Added directories:
        tests/two_parent_workspace_annotate
Modified files:
        ChangeLog cmd_files.cc testsuite.lua

ChangeLog: 

        * 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.

txtwCBl2WvOLN.txt
Description: Diff [8c54b8e93462de125b48a2c2af8adfcc8c919b93] -> [7f8584487a019fab9432f21f3d16825214468e1d]