[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 2734ae9d9ed1dc5ec36bfb10bee6af3887be
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 2734ae9d9ed1dc5ec36bfb10bee6af3887be8bb7 |
Date: |
Sat, 22 Mar 2008 01:06:15 +0100 |
-----------------------------------------------------------------
Revision: 2734ae9d9ed1dc5ec36bfb10bee6af3887be8bb7
Ancestor: 65731c4d5fe0062d1ee6bacb489d50b9ccd45acd
Author: address@hidden
Date: 2008-03-21T10:16:43
Branch: net.venge.monotone.automate_show_conflict
Added files:
cmd_merging.hh tests/automate_show_conflicts/__driver__.lua
tests/automate_show_conflicts/expected-1.stdout
tests/automate_show_conflicts/expected-2.stdout
tests/resolve_duplicate_name_conflict/__driver__.lua
Added directories:
tests/automate_show_conflicts
tests/resolve_duplicate_name_conflict
Modified files:
automate.cc cmd_automate.cc cmd_merging.cc merge.cc
monotone.texi roster_merge.cc roster_merge.hh
ChangeLog:
Create branch net.venge.monotone.automate_show_conflict
* automate.cc: Add show_conflicts (not working yet).
* cmd_automate.cc: bump interface_version.
* cmd_merging.cc (show_conflicts): Split out 'show_conflicts_core' for
use by automate show_conflicts. Add basic_io output option.
* cmd_merging.hh: New file; prototype for show_conflicts_core.
* merge.cc (resolve_merge_conflicts): Match changes to
roster_merge_result::result_* functions.
* monotone.texi (Automation): Add show_conflicts (not complete yet).
* roster_merge.cc (roster_merge_result::report_*): Start adding basic_io
output option; not complete yet.
(roster_merge_result::report_duplicate_name_conflicts): Implement
basic_io option; complete but broken.
* roster_merge.hh (struct roster_merge_result): Add basic_io output option.
* tests/automate_show_conflicts: New test.
* tests/resolve_duplicate_name_conflict: New test, verifying flow for
resolving a duplicate name conflict using automate show_conflicts.
monotone --db={your.database} diff
--revision=65731c4d5fe0062d1ee6bacb489d50b9ccd45acd
--revision=2734ae9d9ed1dc5ec36bfb10bee6af3887be8bb7
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 2734ae9d9ed1dc5ec36bfb10bee6af3887be8bb7,
monotone <=