[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 4b14f62952ce82246e0640d285f5fd2c4863
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 4b14f62952ce82246e0640d285f5fd2c4863b116 |
Date: |
Sun, 21 Sep 2008 07:08:16 +0200 |
-----------------------------------------------------------------
Revision: 4b14f62952ce82246e0640d285f5fd2c4863b116
Ancestor: daf61ccb98db69b00eec9052c063f3a227e066fe
Author: address@hidden
Date: 2008-09-20T18:09:32
Branch: net.venge.monotone.resolve_conflicts
Renamed entries:
tests/resolve_content_conflict/resolve-conflicts-1 to
tests/resolve_content_conflict/conflicts-2
Added files:
tests/resolve_conflicts_errors/__driver__.lua
tests/resolve_conflicts_errors/conflicts-attr-show-1
tests/resolve_conflicts_errors/conflicts-attr-show-2
tests/resolve_conflicts_errors/conflicts-attr-store-1
tests/resolve_conflicts_errors/conflicts-attr-store-2
Added directories:
tests/resolve_conflicts_errors
Modified files:
cmd_conflicts.cc cmd_merging.cc monotone.texi
options_list.hh paths.cc paths.hh roster_merge.cc
roster_merge.hh
tests/resolve_conflicts_all_merge_commands/__driver__.lua
tests/resolve_conflicts_all_resolutions/__driver__.lua
tests/resolve_content_conflict/__driver__.lua
tests/resolve_content_conflict/conflicts-1
tests/resolve_content_conflict/conflicts-2
tests/resolve_content_conflict/merge-1
tests/resolve_content_conflict/update-1
tests/resolve_duplicate_name_conflict/__driver__.lua
Modified attrs:
tests/resolve_conflicts_errors/__driver__.lua
tests/resolve_conflicts_errors/conflicts-attr-store-1
ChangeLog:
Improve resolve-conflicts tests. be consistent about files relative to
workspace root.
* cmd_merging.cc (CMD(store)):
* cmd_conflicts.cc (struct conflicts_t): require conflicts file to be a
bookkeeping file.
(CMD(clean)): fix paths to be bookkeeping paths.
* monotone.texi (Conflicts): conflicts commands require a workspace.
describe default conflicts file.
* options_list.hh (resolve_conflicts_opts, conflicts_opts): require
conflicts file to be a bookkeeping path, provide default.
* paths.cc (normalize_external_path, file_path::file_path): add parameter
'to_workspace_root'.
(new_optimal_path): move here from roster_merge.cc, improve.
* paths.hh: Improve documentation of what is relative to workspace root.
(class file_path constructors): add parameter
'to_workspace_root'.
(file_path_external_ws): new.
* roster_merge.cc (new_optimal_path): Move to paths.cc.
(roster_merge_result::read_conflict_file): conflicts file is a bookkeeping
file.
(parse_resolve_conflicts_str): delete; too messy to maintain.
* tests/resolve_conflicts_all_merge_commands/__driver__.lua: Use
'conflicts' commands, rather than specifying resolution strings.
* tests/resolve_conflicts_all_resolutions/__driver__.lua: conflicts file
must be bookkeeping file.
* tests/resolve_conflicts_errors: New test.
* tests/resolve_content_conflict/__driver__.lua: Test 'conflicts'
operations in non-workspace-root.
* tests/resolve_duplicate_name_conflict/__driver__.lua: use short
--resolve-conflicts option.
monotone --db={your.database} diff
--revision=daf61ccb98db69b00eec9052c063f3a227e066fe
--revision=4b14f62952ce82246e0640d285f5fd2c4863b116
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 4b14f62952ce82246e0640d285f5fd2c4863b116,
monotone <=