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

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

[Monotone-commits-diffs] Revision 9d40e0fc291b77a793b08070d5a018863bb2d1


From: monotone
Subject: [Monotone-commits-diffs] Revision 9d40e0fc291b77a793b08070d5a018863bb2d153
Date: Sat, 27 Sep 2008 17:18:11 +0200

-----------------------------------------------------------------
Revision: 9d40e0fc291b77a793b08070d5a018863bb2d153
Ancestor: 4b14f62952ce82246e0640d285f5fd2c4863b116
Author: address@hidden
Date: 2008-09-22T09:56:51
Branch: net.venge.monotone.resolve_conflicts

Added files:
        tests/resolve_conflicts_all_resolutions/merge3_hook.lua
        tests/resolve_conflicts_all_resolutions/show_first-interactive
Modified files:
        cmd_conflicts.cc monotone.texi options_list.hh
        roster_merge.cc roster_merge.hh
        tests/resolve_conflicts_all_resolutions/__driver__.lua
        tests/resolve_conflicts_all_resolutions/conflicts-1
        tests/resolve_conflicts_all_resolutions/conflicts-resolved
        tests/resolve_conflicts_all_resolutions/merge-1
        tests/resolve_conflicts_all_resolutions/show_first-user
        tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
        tests/resolve_conflicts_all_resolutions/show_remaining-thermostat

ChangeLog: 

add 'interactive' resolution option for content conflicts.

* cmd_conflicts.cc (struct conflicts_t): Add ancestor_roster.
  (show_conflicts): Add 'interactive' option for content conflicts.
  (do_interactive_merge): new.
  (set_first_conflict): add db, lua args for 'interactive'.

* monotone.texi (Conflicts): add 'interactive' option for content conflicts.

* options_list.hh (OPTSET conflicts): Can't call
  bookkeeping_path::external_string_is_bookkeeping_path during option
  processing; workspace has not been found yet.

* roster_merge.cc (read_file_content_conflict): store file_ids for use in
  'interactive' resolution.

* roster_merge.hh (struct file_content_conflict): Add ancestor file_id.

* tests/resolve_conflicts_all_resolutions/__driver__.lua: Test
  'interactive' resolution of content conflict.


Attachment: txt3wqjMlOo0o.txt
Description: Diff [4b14f62952ce82246e0640d285f5fd2c4863b116] -> [9d40e0fc291b77a793b08070d5a018863bb2d153]


reply via email to

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