[Monotone-commits-diffs] Revision caff093817d38b595a6768bb9e940d6f5508bd03

[monotone]

-----------------------------------------------------------------
Revision: caff093817d38b595a6768bb9e940d6f5508bd03
Ancestor: 460314039a4bab88772ed47fced4055329f43dbd
Author: address@hidden
Date: 2007-11-26T06:03:26
Branch: net.venge.monotone.cleanup.conflict-messages

Modified files:
        roster_merge.cc tests/non_content_conflicts/__driver__.lua

ChangeLog: 

        * roster_merge.cc (warn_non_content_conflicts): swap left/right
        nid1/nid2 usage to avoid a failure getting names for nids; add a
        FIXME to make sure left and right are consistent
        * tests/non_content_conflicts/__driver__.lua: add files with
        branch specific content to avoid duplicating the initial revisions
        on each of the various test branches; note that this causes
        get_name to fail with a non-existent nid when issuing convergent
        name conflict messages

txti2z57aAKBg.txt
Description: Diff [460314039a4bab88772ed47fced4055329f43dbd] -> [caff093817d38b595a6768bb9e940d6f5508bd03]