[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision dd1db0c69651cc5c574371c159e8559bd81c
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision dd1db0c69651cc5c574371c159e8559bd81c8ca5 |
Date: |
Sun, 15 Jun 2008 23:04:43 +0200 |
-----------------------------------------------------------------
Revision: dd1db0c69651cc5c574371c159e8559bd81c8ca5
Ancestor: 42a07ab393a277cedd3dfb69238d08e57753e922
Author: address@hidden
Date: 2008-06-14T13:43:32
Branch: net.venge.monotone.automate_show_conflict
Added files:
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_2-jim_1-conflicts
tests/resolve_duplicate_name_conflict/merge-abe_2-jim_1-resolve_conflicts
Modified files:
revision.cc roster.cc roster.hh roster_delta.cc
roster_merge.cc
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_1-beth_1
ChangeLog:
Fix all unit and lua tests. resolve_duplicate_name_conflict not done yet.
* revision.cc: improve comment on current_revision_format.
* roster.cc: change 'current_marking_map_format' to
'current_roster_format', use oldest possible.
(roster_t::required_roster_format): new.
(roster_current_roster_format): new
(shallow_equal): Add 'compare_ancestors' parameter.
(push_marking): Add 'marking_format' parameter.
(roster_t::print_to): Determine marking (roster) format to use.
(roster_t::parse_from): More helpful error message on invalid format.
* roster.hh(shallow_equal): Add 'compare_ancestors' parameter.
(struct marking_t): delete 'invalid' from birth_cause_t; not needed.
constructor default to 'add'.
(class roster_t): add 'required_roster_format'.
(roster_current_roster_format): new for roster_delta.
* roster_delta.cc: Clean up trailing whitespace.
(roster_delta_t::apply): create nodes with null ancestors.
(print_roster_delta_t): use roster_current_roster_format.
* roster_merge.cc (base_scalar::make_dir): create with null ancestors
(base_scalar::make_file): create with null ancestors
(file_scalar::check_result): check left, right, result in
file_content_conflict
(UNIT_TEST roster_merge, node_lifecycle): pass False to shallow_equal
compare_ancestors.
* tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_1-beth_1
(mtn): revids changed back.
*
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_2-jim_1-conflicts:
New file.
* tests/resolve_duplicate_name_conflict/merge-abe_2-jim_1-resolve_conflicts:
New file.
monotone --db={your.database} diff
--revision=42a07ab393a277cedd3dfb69238d08e57753e922
--revision=dd1db0c69651cc5c574371c159e8559bd81c8ca5
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision dd1db0c69651cc5c574371c159e8559bd81c8ca5,
monotone <=