[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 403b93667354008c411e2b175af5835fc238ca
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 403b93667354008c411e2b175af5835fc238caa6 |
Date: |
Sat, 25 Oct 2008 17:32:32 +0200 |
-----------------------------------------------------------------
Revision: 403b93667354008c411e2b175af5835fc238caa6
Ancestor: 47c0d8167bdfb6afeaad49508a7cab90d235c09c
Author: address@hidden
Date: 2008-09-30T15:06:56
Branch: net.venge.monotone.resolve_conflicts
Renamed entries:
tests/resolve_content_conflict to tests/resolve_conflicts_content
tests/resolve_duplicate_name_conflict to
tests/resolve_conflicts_duplicate_name
Added files:
tests/resolve_conflicts_none/__driver__.lua
tests/resolve_conflicts_none/conflicts-1
tests/resolve_conflicts_none/merge-1
tests/resolve_conflicts_none/update-1
tests/resolve_conflicts_propagate/__driver__.lua
tests/resolve_conflicts_propagate/conflicts-1
tests/resolve_conflicts_propagate/conflicts-2
tests/resolve_conflicts_propagate/conflicts-resolved
tests/resolve_conflicts_propagate/propagate-1
tests/resolve_conflicts_propagate/propagate-2
Added directories:
tests/resolve_conflicts_none
tests/resolve_conflicts_propagate
Modified files:
cmd_merging.cc merge.cc monotone.texi roster_merge.cc
roster_merge.hh
tests/resolve_conflicts_errors/__driver__.lua
ChangeLog:
resolve conflicts: handle cases of no conflicts, propagate.
* cmd_merging.cc (CMD(merge_into_dir)): match change to
parse_resolve_conflicts_opts
(show_conflicts_core): don't error on is_ancestor; use same logic as
'propagate'.
* merge.cc (interactive_merge_and_store): match change to
parse_resolve_conflicts_opts
* monotone.texi (Automation show_conflicts): doc that only left, right
output if no conflicts.
* roster_merge.hh:
* roster_merge.cc (roster_merge_result::read_conflict_file): handle case
of no conflicts.
(parse_resolve_conflicts_opts): add left_rid, right_rid, check them.
Handle case of no conflicts.
* tests/resolve_conflicts_content: renamed
* tests/resolve_conflicts_duplicate_name: renamed
* tests/resolve_conflicts_errors/__driver__.lua: add FIXME
* tests/resolve_conflicts_none: New test.
* tests/resolve_conflicts_propagate: New test.
txt66OMsWFC8B.txt
Description: Diff [47c0d8167bdfb6afeaad49508a7cab90d235c09c] -> [403b93667354008c411e2b175af5835fc238caa6]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 403b93667354008c411e2b175af5835fc238caa6,
monotone <=