[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 9e9380d52de6c950651c75e219e3a8252901
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 9e9380d52de6c950651c75e219e3a82529010b59 |
Date: |
Sun, 11 May 2008 15:40:26 +0200 |
-----------------------------------------------------------------
Revision: 9e9380d52de6c950651c75e219e3a82529010b59
Ancestor: 647ae8f26c120d3a0175227173fef119424ec832
Author: address@hidden
Date: 2008-05-10T20:44:21
Branch: net.venge.monotone.automate_show_conflict
Modified files:
basic_io.cc basic_io.hh cmd_merging.cc
luaext_parse_basic_io.cc merge.cc merge.hh options_list.hh
roster_merge.cc roster_merge.hh
tests/common/test_utils_inventory.lua
tests/resolve_duplicate_name_conflict/__driver__.lua
ChangeLog:
--resolve-conflicts: add file parsing, some infrastructure for suture
resolution; suture not yet implemented.
* basic_io.hh,
* basic_io.cc (stanza::push_str_pair(symbol, symbol): new function.
* cmd_merging.cc: Add resolve_conflicts_opts to appropriate commands,
comments to others.
(CMD(merge_into_dir)): Call parse_resolve_conflicts_opts.
* luaext_parse_basic_io.cc: Add comment on expected input structure.
* merge.cc (resolve_merge_conflicts): Report errors before attempting
resolutions.
(interactive_merge_and_store): Call parse_resolve_conflicts_opts.
* options_list.hh (resolve_conflicts_opts): Fix spelling. Change
resolve_conflicts_file to take a file name argument. Add check that
only one resolve_conflicts argument is given.
* roster_merge.cc (namespace syms): Add more symbols for parsing and
generating conflicts file.
(put_*_conflict): use push_file_pair.
(roster_merge_result::report_*_conflicts): Use new symbols for conflict
labels.
(parse_duplicate_name_conflicts): New function.
(parse_resolve_conflicts_str): New function.
(parse_resolve_conflicts_opts): New function.
(roster_merge_result::resolve_duplicate_name_conflicts): Remove opts
argument. Improve loop. Factor out parsing resolutions. suturing not
supported yet.
* roster_merge.hh: Support conflict resolutions for duplicate_name_conflict.
* tests/common/test_utils_inventory.lua (check_basic_io_line): Allow nil
value.
* tests/resolve_duplicate_name_conflict/__driver__.lua: Put back suture
test; currently failing.
monotone --db={your.database} diff
--revision=647ae8f26c120d3a0175227173fef119424ec832
--revision=9e9380d52de6c950651c75e219e3a82529010b59
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 9e9380d52de6c950651c75e219e3a82529010b59,
monotone <=