[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 7797cab88ceb3f54487cb619a16ed7102c13b3
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 7797cab88ceb3f54487cb619a16ed7102c13b3ec |
Date: |
Wed, 10 Sep 2008 07:13:21 +0200 |
-----------------------------------------------------------------
Revision: 7797cab88ceb3f54487cb619a16ed7102c13b3ec
Ancestor: 03616a16ca9c971baf666899eb2c486d18364d7e
Author: address@hidden
Date: 2008-09-08T12:16:43
Branch: net.venge.monotone.resolve_conflicts
Renamed entries:
tests/resolve_conflict_all_resolutions to
tests/resolve_conflicts_all_resolutions
Added files:
tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
tests/resolve_conflicts_all_resolutions/show_remaining-thermostat
tests/resolve_conflicts_read_all/__driver__.lua
tests/resolve_conflicts_read_all/invalid-add_left
tests/resolve_conflicts_read_all/invalid-add_right
tests/resolve_conflicts_read_all/invalid-rename_left
tests/resolve_conflicts_read_all/invalid-rename_right
tests/resolve_conflicts_read_all/missing-root_left
tests/resolve_conflicts_read_all/missing-root_right
Added directories:
tests/resolve_conflicts_read_all
Modified files:
cmd_conflicts.cc cmd_merging.cc merge.cc monotone.texi
paths.cc roster_merge.cc roster_merge.hh
tests/resolve_conflicts_all_resolutions/__driver__.lua
ChangeLog:
Adding 'conflicts show_remaining'; requires reading all conflicts from a
conflicts file. Done thru invalid_name.
* cmd_conflicts.cc (show_conflicts): add show_remaining.
(CMD(show_remaining)): new.
* cmd_merging.cc (show_conflicts_core): add warn_unsupported.
(CMD(store)): improve doc string, use warn_unsupported.
* merge.cc (resolve_merge_conflicts): Rename missing_dir_root ->
missing_root_conflict; makes finding refs to it easier.
* monotone.texi (Conflicts): Add show_remaining.
(Automation show_conflicts): directory_loop_created changed to directory_loop
* paths.cc (normalize_external_path): Allow "".
* roster_merge.cc: Rename missing_dir_root ->
missing_root_conflict; makes finding refs to it easier.
(roster_merge_result::count_unsupported_resolution): new.
(get_nid_name_pair): new.
(read_added_rename_conflict_left): new.
(read_added_rename_conflict_right): new.
(read_missing_root_conflicts): new.
(read_invalid_name_conflict): new.
(read_invalid_name_conflicts): new.
(read_directory_loop_conflict): new; not finished.
(read_directory_loop_conflicts): new.
(read_orphaned_node_conflict): new.
(read_orphaned_node_conflicts): new.
(read_conflict_file_core): better error messages.
* roster_merge.hh (struct invalid_name_conflict, struct
directory_loop_conflict, struct orphaned_node_conflict): improve
comments.
* tests/resolve_conflict_all_resolutions: renamed to
resolve_conflicts_all_resolutions for consistency.
* tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left:
New file.
* tests/resolve_conflicts_all_resolutions/show_remaining-thermostat: New file.
* tests/resolve_conflicts_read_all: New test
txtPanpreZzcU.txt
Description: Diff [03616a16ca9c971baf666899eb2c486d18364d7e] -> [7797cab88ceb3f54487cb619a16ed7102c13b3ec]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 7797cab88ceb3f54487cb619a16ed7102c13b3ec,
monotone <=