[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision bc23305f97c1e2b0de46ee584bc327c5fff5
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision bc23305f97c1e2b0de46ee584bc327c5fff56f2d |
Date: |
Mon, 24 Aug 2009 02:38:32 +0200 |
-----------------------------------------------------------------
Revision: bc23305f97c1e2b0de46ee584bc327c5fff56f2d
Ancestor: 207c17da6b32b1a3ba01bd93f776e0bcf20debdd
Author: address@hidden
Date: 2009-08-24T00:09:46
Branch: net.venge.monotone
Added files:
tests/resolve_conflicts_orphaned_file/__driver__.lua
Added directories:
tests/resolve_conflicts_orphaned_file
Modified files:
NEWS cmd_conflicts.cc merge_conflict.cc merge_content.cc
merge_roster.cc merge_roster.hh monotone.texi
tests/resolve_conflicts_all_resolutions/conflicts-resolved
tests/resolve_conflicts_content/conflicts-2
tests/resolve_conflicts_read_all/missing-root_left
tests/resolve_conflicts_read_all/missing-root_right
tests/resolve_conflicts_read_all/orphaned-add_left
tests/resolve_conflicts_read_all/orphaned-add_right
tests/resolve_conflicts_read_all/orphaned-rename_left
tests/resolve_conflicts_read_all/orphaned-rename_right
ChangeLog:
support resolving orphaned node conflicts.
* cmd_conflicts.cc (show_conflicts, set_first_conflict): add orphaned node
* merge_conflict.cc (namespace): delete resolved_user
(put_resolution): renamed from put_duplicate_name_resolution
(put_content_conflict): use put_resolution
(roster_merge_result::report_orphaned_node_conflicts): add put_resolution.
(read_orphaned_node_conflict): check for resolution.
(validate_orphaned_node_conflicts): new
(read_file_content_conflict): use resolved_user_left instead of resolved_user
(read_conflict_file_core): can resolve orphaned_node_conflicts
(roster_merge_result::resolve_orphaned_node_conflicts): new
* merge_content.cc (resolve_merge_conflicts): can resolve
orphaned_node_conflicts
* merge_roster.cc (roster_merge_result::count_unsupported_resolution):
can resolve orphaned_node_conflicts
* merge_roster.hh (struct orphaned_node_conflict): add resolution
(struct roster_merge_result): add resolve_orphaned_node_conflicts
* monotone.texi (Merge Conflicts): can resolve orphaned_node_conflicts
(Conflicts): doc orphaned node resolutions
* tests/resolve_conflicts_orphaned_file: New file.
* tests/resolve_conflicts_orphaned_file/__driver__.lua: New file.
* tests/resolve_conflicts_all_resolutions/conflicts-resolved:
* tests/resolve_conflicts_content/conflicts-2:
* tests/resolve_conflicts_read_all/missing-root_left:
* tests/resolve_conflicts_read_all/missing-root_right:
* tests/resolve_conflicts_read_all/orphaned-add_left:
* tests/resolve_conflicts_read_all/orphaned-add_right:
* tests/resolve_conflicts_read_all/orphaned-rename_left:
* tests/resolve_conflicts_read_all/orphaned-rename_right: can resolve
orphaned_node_conflicts
monotone --db={your.database} diff
--revision=207c17da6b32b1a3ba01bd93f776e0bcf20debdd
--revision=bc23305f97c1e2b0de46ee584bc327c5fff56f2d
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision bc23305f97c1e2b0de46ee584bc327c5fff56f2d,
monotone <=