[Monotone-commits-diffs] Revision 8e31c7bd779710254b1d0425c0e35bc98598d813

[monotone]

-----------------------------------------------------------------
Revision: 8e31c7bd779710254b1d0425c0e35bc98598d813
Ancestor: 726aaf7152d47e625f3217a587744bd5622e8590
Author: address@hidden
Date: 2008-05-16T12:10:59
Branch: net.venge.monotone.automate_show_conflict

Added files:
        tests/resolve_duplicate_name_conflict/checkout.sh-merged
        tests/resolve_duplicate_name_conflict/conflicts-resolved
Modified files:
        cset.cc cset.hh roster.cc roster.hh roster_merge.cc
        tests/resolve_duplicate_name_conflict/__driver__.lua

ChangeLog: 

Add suture handling in rosters, changesets. First merge test case passes.

* cset.hh (struct cset): Add nodes_sutured.

* cset.cc (cset::empty): check nodes_sutured.
  (cset::clear): Clear nodes_sutured.
  (cset::apply_to): Handle nodes_sutured.
  (print_cset): Output nodes_sutured.
  (parse_cset): Input nodes_sutured.

* roster.cc (dump node_t): Output ancestors
  (roster_t::create_dir_node): Handle ancestors
  (roster_t::create_file_node): Handle ancestors
  (delta_only_in_from): Comment about handling sutures.
  (delta_only_in_to): Handle sutures.
  (select_nodes_modified_by_cset): Handle sutures.

* roster.hh (struct node): Add ancestors
  (class roster_t): Handle ancestors in create_dir_node,
  create_file_node. Clean up comment about old_locations vs deleting
  nodes.

* roster_merge.cc (parse_resolve_conflicts_str): More error checking. Get
  sutured file name. Handle basic_io parser properly.
  (roster_merge_result::resolve_duplicate_name_conflicts): Don't allow
  suturing directories.

* tests/resolve_duplicate_name_conflict/__driver__.lua: Now passes.

* tests/resolve_duplicate_name_conflict/checkout.sh-merged: New file.

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

txtXLnd89aRbK.txt
Description: Diff [726aaf7152d47e625f3217a587744bd5622e8590] -> [8e31c7bd779710254b1d0425c0e35bc98598d813]