monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 671ef0bef5d5036905857dda541641c89fd6a9


From: monotone
Subject: [Monotone-commits-diffs] Revision 671ef0bef5d5036905857dda541641c89fd6a973
Date: Wed, 3 Sep 2008 01:10:38 +0200

-----------------------------------------------------------------
Revision: 671ef0bef5d5036905857dda541641c89fd6a973
Ancestor: db337bc730cc15eae78f94a423bc460823b07e0a
Author: address@hidden
Date: 2008-09-02T18:54:01
Branch: net.venge.monotone.resolve_conflicts

Added files:
        cmd_conflicts.cc
        tests/resolve_duplicate_name_conflict/conflicts-resolved
Modified files:
        Makefile.am cmd.hh cmd_merging.cc options_list.hh
        roster_merge.cc roster_merge.hh
        tests/resolve_conflict_all_resolutions/__driver__.lua
        tests/resolve_duplicate_name_conflict/__driver__.lua

ChangeLog: 

Use path types more appropriately. Add partial support for drop, user duplicate 
name resolutions. monotone.texi not updated yet.

* Makefile.am (CMD_SOURCES): add cmd_conflicts.cc

* cmd.hh: add CMD_FWD_DECL(conflicts);

* cmd_conflicts.cc: New file.

* cmd_merging.cc (get_conflicts_rids): new, split out from
  CMD_AUTOMATE(show_conflicts).
  (CMD_AUTOMATE(show_conflicts)): add ignore_suspend_certs for picking
  branches to merge. use get_conflicts_rids.
  (CMD(resolve_conflicts)): Move to cmd_conflicts.cc.
  (CMD(conflicts store)): new.

* options_list.hh: Add conflicts_opts for new commands.

* roster_merge.cc (namespace resolve_conflicts): new functions
  new_file_path, new_optimal_path.
  (namespace syms): add symbols for drop, user duplicate name
  resolutions.
  (put_duplicate_name_resolution): new.
  (roster_merge_result::report_duplicate_name_conflicts): use it.
  (read_duplicate_name_conflict): add drop, user.
  (roster_merge_result::set_first_conflict): move to cmd_conflicts.cc.
  (roster_merge_result::resolve_duplicate_name_conflicts): user, drop
  resolutions raise invariant failure; need implementation.

* roster_merge.hh (resolve_conflicts): declare file_resolution_t, use
  class-wide pointer for file type, to allow keeping it relative if
  possible.
  (struct duplicate_name_conflict): use it.
  (struct file_content_conflict): use it.

* tests/resolve_conflict_all_resolutions/__driver__.lua: Start converting
  to new conflicts commands; not done.

* tests/resolve_duplicate_name_conflict/__driver__.lua: Convert to new
  conflicts commands. Not passing because drop, user not implemented.

* tests/resolve_duplicate_name_conflict/conflicts-resolved: New file.

Attachment: txtReW8TsyPF_.txt
Description: Diff [db337bc730cc15eae78f94a423bc460823b07e0a] -> [671ef0bef5d5036905857dda541641c89fd6a973]


reply via email to

[Prev in Thread] Current Thread [Next in Thread]