[Monotone-commits-diffs] Revision 726aaf7152d47e625f3217a587744bd5622e8590

[monotone]

-----------------------------------------------------------------
Revision: 726aaf7152d47e625f3217a587744bd5622e8590
Ancestor: 9e9380d52de6c950651c75e219e3a82529010b59
Author: address@hidden
Date: 2008-05-11T13:36:08
Branch: net.venge.monotone.automate_show_conflict

Modified files:
        merge.cc roster.cc roster.hh roster_merge.cc
        tests/resolve_duplicate_name_conflict/__driver__.lua

ChangeLog: 

Initial suture implementation; doesn't succeed.

* merge.cc (store_roster_merge_result): Allow temporary node ids in
  check_sane; resolve_merge_conflicts can now add nodes.

* roster.cc (roster_t::drop_detached_node): Allow dropping nodes that
  have never been attached.

* roster.hh: Update comments on deleting never-attached nodes.

* roster_merge.cc (attach_node): Renamed from set_new_name_in_roster.
  (roster_merge_result::resolve_duplicate_name_conflicts): Implement
  suture, clean up comments.

* tests/resolve_duplicate_name_conflict/__driver__.lua: Clean up
  workspace before update. Check all file content. 'checkout.sh'
  currently failing to do diediedie vs suture.

txtZDVJ02kXLj.txt
Description: Diff [9e9380d52de6c950651c75e219e3a82529010b59] -> [726aaf7152d47e625f3217a587744bd5622e8590]