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

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

[Monotone-commits-diffs] Revision 938e10f5db05519407c04434084d78ea9b565d


From: monotone
Subject: [Monotone-commits-diffs] Revision 938e10f5db05519407c04434084d78ea9b565d60
Date: Sun, 29 Jun 2008 13:45:44 +0200

-----------------------------------------------------------------
Revision: 938e10f5db05519407c04434084d78ea9b565d60
Ancestor: 365319fc94f5191f924d45536e0f265a4652d525
Author: address@hidden
Date: 2008-06-27T12:45:03
Branch: net.venge.monotone.automate_show_conflict

Modified files:
        cmd_merging.cc diff_patch.cc diff_patch.hh merge.cc
        roster.hh roster_merge.cc roster_merge.hh
        tests/automate_show_conflicts/expected-content-attached.stdout
        work.cc work.hh

ChangeLog: 

Check if internal merger will work later in merge process, to simplify unit 
testing of roster_merge. Fix some bugs; some tests still failing.

* cmd_merging.cc (three_way_merge): revert previous addition of
  content_merge_adaptor.
  (CMD update, CMD merge_into_dir, CMD merge_into_workspace, CMD pluck):
  revert previous move of content_merge_workspace_adaptor.
  (show_conflicts_core): add lua for checking internal merger; move check
  to report_file_content_conflicts.

* diff_patch.cc: Revert previous addition of lua to try_user_merge; lua
  is back in content_merger.

* diff_patch.hh (struct content_merger): revert previous deletiong of lua
  from content_merger.

* merge.cc (interactive_merge_and_store): revert previous move of
  content_merge_database_adaptor.

* roster_merge.cc (roster_merge_result::report_file_content_conflicts):
  move check of internal merger here.
  (merge_nodes): revert addition of arguments needed for internal merger check.

* roster_merge.hh (roster_merge_result::report_file_conflicts): Add lua,
  make non-const for internal merger check.

* tests/automate_show_conflicts/expected-content-attached.stdout: Add
  'resolved_internal' as appropriate.

* work.cc (workspace::get_current_roster): update markings as well as roster.
  (workspace::update_from_filesystem): new

* work.hh (workspace::update_from_filesystem): new


Attachment: txt4Grs10L65p.txt
Description: Diff [365319fc94f5191f924d45536e0f265a4652d525] -> [938e10f5db05519407c04434084d78ea9b565d60]


reply via email to

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