[Monotone-commits-diffs] Revision 11a44beb54486debc06b0787bef69a5314e6aef4

[monotone]

-----------------------------------------------------------------
Revision: 11a44beb54486debc06b0787bef69a5314e6aef4
Ancestor: a4e61161114ba1223d7b993146a6e47fd8fd9702
Author: address@hidden
Date: 2005-08-24T05:36:08
Branch: net.venge.monotone.precise-cdv

Modified files:
        ChangeLog change_set.cc change_set.hh pcdv.cc
        tests/t_merge_add_rename_add.at

ChangeLog: 

2005-08-24  Timothy Brownawell  <address@hidden>
        * tests/t_merge_add_rename_add.at: remove XFAIL
        The result of this merge (<mv a b>, <add b>) are now defined: call
        the resolve_path_conflicts hook with a "collision" type conflict.
        Not resolving the conflict (in this case) leads to a warning,
        followed by a crash. The warning should be an error, but is triggered
        by the monotone db.

txtkm420dkW5Z.txt
Description: Diff [a4e61161114ba1223d7b993146a6e47fd8fd9702] -> [11a44beb54486debc06b0787bef69a5314e6aef4]