monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision f425680fa825c71deea1886c9df5e7cf288003


From: monotone
Subject: [Monotone-commits-diffs] Revision f425680fa825c71deea1886c9df5e7cf28800349
Date: Fri, 14 Dec 2007 07:05:23 +0100

-----------------------------------------------------------------
Revision: f425680fa825c71deea1886c9df5e7cf28800349
Ancestor: 74b915ecaf266be46ca18ecf6c51736cf65d96b6
Author: address@hidden
Date: 2007-12-14T05:37:58
Branch: net.venge.monotone.cleanup.conflict-messages

Modified files:
        cmd_merging.cc roster_merge.cc
        tests/conflict_messages/__driver__.lua

ChangeLog: 

        * cmd_merging.cc (merge_into_dir): refer to revisions as "left"
        and "right" rather than "source" and "target" so that both
        merge_into_dir and propagate are consistent with conflict messages
        * roster_merge.cc (dump_conflicts): add "_" characters to missing
        root conflict dump message for consistency with dumps of other
        conflict types
        * tests/conflict_messages/__driver__.lua: use variables for branch
        names and expected messages add tests for propagate to all
        conflict cases


Attachment: txtthyhYAFPVn.txt
Description: Diff [74b915ecaf266be46ca18ecf6c51736cf65d96b6] -> [f425680fa825c71deea1886c9df5e7cf28800349]


reply via email to

[Prev in Thread] Current Thread [Next in Thread]