[Monotone-commits-diffs] Revision fb2aac813d308a06d48c772a66bb9435a0f4cdef

[monotone]

-----------------------------------------------------------------
Revision: fb2aac813d308a06d48c772a66bb9435a0f4cdef
Ancestor: 3f712b1802c934090ea938548a9201c81cc7be66
Author: address@hidden
Date: 2005-04-27T06:37:14
Branch: net.venge.monotone.annotate

Added files:
        tests/t_annotate_add_collision.at
Modified files:
        annotate.cc tests/t_annotate.at testsuite.at

ChangeLog: 

2005-04-26 Emile Snyder <address@hidden>

        * annotate.cc: Fix handling the the file addition edge cases
        (again).  Nth time's the charm...
        * tests/t_annotate_add_collision.at: New test.  Tests annotate
        when a file has mutiple original copies on separate
        (micro)branches.
        * tests/t_annotate.at: Trivial changes.
        * testsuite.at: Add new test.

txtpRwVdB05_U.txt
Description: Diff [3f712b1802c934090ea938548a9201c81cc7be66] -> [fb2aac813d308a06d48c772a66bb9435a0f4cdef]