[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 2c90515181da94d089443c045d317d685b4496
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 2c90515181da94d089443c045d317d685b44967f |
Date: |
Sun, 9 Dec 2007 21:05:23 +0100 |
-----------------------------------------------------------------
Revision: 2c90515181da94d089443c045d317d685b44967f
Ancestor: 22e7293a23468d5e222e7eb6fd08e76796c73704
Author: address@hidden
Date: 2007-12-09T07:42:50
Branch: net.venge.monotone.cleanup.conflict-messages
Modified files:
cmd_merging.cc diff_patch.cc merge.cc roster_merge.cc
roster_merge.hh tests/conflict_messages/__driver__.lua
ChangeLog:
* cmd_merging.cc (show_conflicts): reorder conflict types so that
structural conflicts are listed before attribute and content
conflicts
* merge.cc (resolve_merge_conflicts): reorder conflict types so
that structural conflicts are listed before attribute and content
conflicts; also add notes about not reporting content conflicts
before attempting to auto merge them and resolving them in two
passes so this is possible
* roster_merge.{cc,hh}: reorder code to match the order in which
conflicts are listed above
* tests/conflict_messages/__driver__.lua: reorder the tests too
txty03NE4gB_N.txt
Description: Diff [22e7293a23468d5e222e7eb6fd08e76796c73704] -> [2c90515181da94d089443c045d317d685b44967f]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 2c90515181da94d089443c045d317d685b44967f,
monotone <=