[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision d71c0ed3d94eed7804a99d5c76a3a732a35b42
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision d71c0ed3d94eed7804a99d5c76a3a732a35b4233 |
Date: |
Wed, 10 Sep 2008 07:13:22 +0200 |
-----------------------------------------------------------------
Revision: d71c0ed3d94eed7804a99d5c76a3a732a35b4233
Ancestor: 2811cde4d7b44ba5d5bf73ef82ed9eb41056f80d
Author: address@hidden
Date: 2008-09-10T05:09:54
Branch: net.venge.monotone.resolve_conflicts
Added files:
tests/resolve_conflicts_read_all/attribute-attached_left
tests/resolve_conflicts_read_all/attribute-attached_right
tests/resolve_conflicts_read_all/attribute-detached_left
tests/resolve_conflicts_read_all/attribute-detached_right
tests/resolve_conflicts_read_all/content-attached_left
tests/resolve_conflicts_read_all/content-attached_right
tests/resolve_conflicts_read_all/content-detached_left
tests/resolve_conflicts_read_all/content-detached_right
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_left
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_right
tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_left
tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_right
tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_left
tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_right
tests/resolve_conflicts_read_all/multiple-name-plus-orphan_left
tests/resolve_conflicts_read_all/multiple-name-plus-orphan_right
tests/resolve_conflicts_read_all/unrelated-projects_left
tests/resolve_conflicts_read_all/unrelated-projects_right
Modified files:
roster_merge.cc
tests/resolve_conflicts_read_all/__driver__.lua
ChangeLog:
Finish tests/resolve_conflicts_read_all.
* roster_merge.cc (roster_merge_result::report_attribute_conflicts):
handle null result roster, as in 'conflicts show_remaining'.
(read_missing_root_conflicts): Handle unrelated projects case.
(read_attr_state_left): fix bugs.
* tests/resolve_conflicts_read_all/__driver__.lua:
(duplicate-name-multiple-name-missing-root): special case of second commit.
* tests/resolve_conflicts_read_all/*: Finish all test cases
txtCzmwOPgzP2.txt
Description: Diff [2811cde4d7b44ba5d5bf73ef82ed9eb41056f80d] -> [d71c0ed3d94eed7804a99d5c76a3a732a35b4233]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision d71c0ed3d94eed7804a99d5c76a3a732a35b4233,
monotone <=