[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 6ef998b5433b34d70a1c7ff98cf5bd6168a761
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 6ef998b5433b34d70a1c7ff98cf5bd6168a76166 |
Date: |
Sun, 23 Mar 2008 21:05:59 +0100 |
-----------------------------------------------------------------
Revision: 6ef998b5433b34d70a1c7ff98cf5bd6168a76166
Ancestor: 7133f78685d0bf43123fafd6387407ef26f2ef14
Author: address@hidden
Date: 2008-03-22T17:09:00
Branch: net.venge.monotone.automate_show_conflict
Added files:
tests/automate_show_conflicts/__driver__.lua
tests/automate_show_conflicts/expected-missing-root.stdout
Added directories:
tests/automate_show_conflicts
Modified files:
cmd_merging.cc merge.cc monotone.texi roster_merge.cc
roster_merge.hh
ChangeLog:
'automate show_conflict' support missing root, orphaned directory conflicts.
* cmd_merging.cc (show_conflicts_core): Add db param to remaining
report_missing_*_conflicts.
(automate show_conflicts): Improve help strings.
* merge.cc (resolve_merge_conflicts): Add db param to remaining
report_missing_*_conflicts.
* monotone.texi (Merge Conflicts): Mention 'automate show_conflicts'.
(show_conflicts): Mention that it doesn't show update conflicts.
(Automate show_conflicts): Specify that revs default to the ones merge
would choose. Mention that it doesn't show update conflicts.
* roster_merge.cc (syms): Alphabetize, add symbols.
(roster_merge_result::report_missing_root_conflicts): Add db parameter.
Support basic_io for missing root.
(roster_merge_result::report_invalid_name_conflicts): Add db parameter.
(roster_merge_result::report_directory_loop_conflicts): Add db parameter.
(roster_merge_result::report_orphaned_node_conflicts): Add db parameter.
Support basic_io for orphaned directory, renamed directory.
(roster_merge_result::report_multiple_name_conflicts): Add db parameter.
(roster_merge_result::report_attribute_conflicts): Add db parameter.
(roster_merge_result::report_file_content_conflicts): Add db parameter.
* roster_merge.hh (struct roster_merge_result): Add db param to remaining
report_missing_*_conflicts.
* tests/automate_show_conflicts: New test; creates all test cases that
conflict_messages test does. Only missing-root passes.
txtHPC3wbdP8n.txt
Description: Diff [7133f78685d0bf43123fafd6387407ef26f2ef14] -> [6ef998b5433b34d70a1c7ff98cf5bd6168a76166]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 6ef998b5433b34d70a1c7ff98cf5bd6168a76166,
monotone <=