============================================================= Expected 'lambda' and actual 'lambda' are different! ============================================================= EXPECTED NODE TO BE: ============================================================= * Node name: lambda Path: __SVN_ROOT_NODE/A/B/lambda Contents: This is the file 'lambda'. Properties: {} Attributes: {} Children: N/A (node is a file) ============================================================= ACTUAL NODE FOUND: ============================================================= * Node name: lambda Path: B/lambda Contents: This is the file 'lambda'. <<<<<<< .mine Conflicting appended text for lambda ======= Original appended text for lambda >>>>>>> .r2 Properties: {} Attributes: {} Children: N/A (node is a file) Unequal at node lambda Unequal at node B Unequal at node A EXCEPTION: SVNTreeUnequal FAIL: basic_tests.py 39: automatic conflict resolution